Snap for 11157599 from f9365edac534ed07c8fc2fa7405a7503f08d48e8 to 24Q1-release (e41ea172) · Commits · e / os / android_build_soong

android/androidmk.go

+0 −20

Original line number	Diff line number	Diff line
		@@ -486,17 +486,6 @@ func (a *AndroidMkEntries) GetDistForGoals(mod blueprint.Module) []string {
		return generateDistContributionsForMake(distContributions)
		}

		// Write the license variables to Make for AndroidMkData.Custom(..) methods that do not call WriteAndroidMkData(..)
		// It's required to propagate the license metadata even for module types that have non-standard interfaces to Make.
		func (a *AndroidMkEntries) WriteLicenseVariables(w io.Writer) {
		AndroidMkEmitAssignList(w, "LOCAL_LICENSE_KINDS", a.EntryMap["LOCAL_LICENSE_KINDS"])
		AndroidMkEmitAssignList(w, "LOCAL_LICENSE_CONDITIONS", a.EntryMap["LOCAL_LICENSE_CONDITIONS"])
		AndroidMkEmitAssignList(w, "LOCAL_NOTICE_FILE", a.EntryMap["LOCAL_NOTICE_FILE"])
		if pn, ok := a.EntryMap["LOCAL_LICENSE_PACKAGE_NAME"]; ok {
		AndroidMkEmitAssignList(w, "LOCAL_LICENSE_PACKAGE_NAME", pn)
		}
		}

		// fillInEntries goes through the common variable processing and calls the extra data funcs to
		// generate and fill in AndroidMkEntries's in-struct data, ready to be flushed to a file.
		type fillInEntriesContext interface {
		@@ -534,15 +523,6 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
		// Collect make variable assignment entries.
		a.SetString("LOCAL_PATH", ctx.ModuleDir(mod))
		a.SetString("LOCAL_MODULE", name+a.SubName)
		a.AddStrings("LOCAL_LICENSE_KINDS", base.commonProperties.Effective_license_kinds...)
		a.AddStrings("LOCAL_LICENSE_CONDITIONS", base.commonProperties.Effective_license_conditions...)
		a.AddStrings("LOCAL_NOTICE_FILE", base.commonProperties.Effective_license_text.Strings()...)
		// TODO(b/151177513): Does this code need to set LOCAL_MODULE_IS_CONTAINER ?
		if base.commonProperties.Effective_package_name != nil {
		a.SetString("LOCAL_LICENSE_PACKAGE_NAME", *base.commonProperties.Effective_package_name)
		} else if len(base.commonProperties.Effective_licenses) > 0 {
		a.SetString("LOCAL_LICENSE_PACKAGE_NAME", strings.Join(base.commonProperties.Effective_licenses, " "))
		}
		a.SetString("LOCAL_MODULE_CLASS", a.Class)
		a.SetString("LOCAL_PREBUILT_MODULE_FILE", a.OutputFile.String())
		a.AddStrings("LOCAL_REQUIRED_MODULES", a.Required...)

apex/androidmk.go

+0 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,6 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData {
		fmt.Fprintln(w, "\ninclude $(CLEAR_VARS) # apex.apexBundle")
		fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
		fmt.Fprintln(w, "LOCAL_MODULE :=", name)
		data.Entries.WriteLicenseVariables(w)
		fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC") // do we need a new class?
		fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", a.outputFile.String())
		fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", a.installDir.String())

bpf/bpf.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -229,7 +229,6 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData {
		names = append(names, objName)
		fmt.Fprintln(w, "include $(CLEAR_VARS)", " # bpf.bpf.obj")
		fmt.Fprintln(w, "LOCAL_MODULE := ", objName)
		data.Entries.WriteLicenseVariables(w)
		fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", obj.String())
		fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", obj.Base())
		fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC")
		@@ -239,7 +238,6 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData {
		}
		fmt.Fprintln(w, "include $(CLEAR_VARS)", " # bpf.bpf")
		fmt.Fprintln(w, "LOCAL_MODULE := ", name)
		data.Entries.WriteLicenseVariables(w)
		android.AndroidMkEmitAssignList(w, "LOCAL_REQUIRED_MODULES", names)
		fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")
		},

cc/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ bootstrap_go_package {
		"lto.go",
		"makevars.go",
		"orderfile.go",
		"pgo.go",
		"prebuilt.go",
		"proto.go",
		"rs.go",

cc/cc.go

+10 −24

Original line number	Diff line number	Diff line
		@@ -141,6 +141,8 @@ type Deps struct {

		// List of libs that need to be excluded for APEX variant
		ExcludeLibsForApex []string
		// List of libs that need to be excluded for non-APEX variant
		ExcludeLibsForNonApex []string
		}

		// PathDeps is a struct containing file paths to dependencies of a module.
		@@ -529,7 +531,6 @@ type ModuleContextIntf interface {
		baseModuleName() string
		getVndkExtendsModuleName() string
		isAfdoCompile() bool
		isPgoCompile() bool
		isOrderfileCompile() bool
		isCfi() bool
		isFuzzer() bool
		@@ -728,6 +729,8 @@ type libraryDependencyTag struct {

		// Whether or not this dependency has to be followed for the apex variants
		excludeInApex bool
		// Whether or not this dependency has to be followed for the non-apex variants
		excludeInNonApex bool

		// If true, don't automatically export symbols from the static library into a shared library.
		unexportedSymbols bool
		@@ -891,7 +894,6 @@ type Module struct {
		vndkdep *vndkdep
		lto *lto
		afdo *afdo
		pgo *pgo
		orderfile *orderfile

		library libraryInterface
		@@ -1274,9 +1276,6 @@ func (c *Module) Init() android.Module {
		if c.afdo != nil {
		c.AddProperties(c.afdo.props()...)
		}
		if c.pgo != nil {
		c.AddProperties(c.pgo.props()...)
		}
		if c.orderfile != nil {
		c.AddProperties(c.orderfile.props()...)
		}
		@@ -1406,13 +1405,6 @@ func (c *Module) isAfdoCompile() bool {
		return false
		}

		func (c *Module) isPgoCompile() bool {
		if pgo := c.pgo; pgo != nil {
		return pgo.Properties.PgoCompile
		}
		return false
		}

		func (c *Module) isOrderfileCompile() bool {
		if orderfile := c.orderfile; orderfile != nil {
		return orderfile.Properties.OrderfileLoad
		@@ -1721,10 +1713,6 @@ func (ctx *moduleContextImpl) isAfdoCompile() bool {
		return ctx.mod.isAfdoCompile()
		}

		func (ctx *moduleContextImpl) isPgoCompile() bool {
		return ctx.mod.isPgoCompile()
		}

		func (ctx *moduleContextImpl) isOrderfileCompile() bool {
		return ctx.mod.isOrderfileCompile()
		}
		@@ -1837,7 +1825,6 @@ func newModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Mo
		module.vndkdep = &vndkdep{}
		module.lto = &lto{}
		module.afdo = &afdo{}
		module.pgo = &pgo{}
		module.orderfile = &orderfile{}
		return module
		}
		@@ -2263,9 +2250,6 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
		if c.afdo != nil {
		flags = c.afdo.flags(ctx, flags)
		}
		if c.pgo != nil {
		flags = c.pgo.flags(ctx, flags)
		}
		if c.orderfile != nil {
		flags = c.orderfile.flags(ctx, flags)
		}
		@@ -2417,9 +2401,6 @@ func (c *Module) begin(ctx BaseModuleContext) {
		if c.orderfile != nil {
		c.orderfile.begin(ctx)
		}
		if c.pgo != nil {
		c.pgo.begin(ctx)
		}
		if ctx.useSdk() && c.IsSdkVariant() {
		version, err := nativeApiLevelFromUser(ctx, ctx.sdkVersion())
		if err != nil {
		@@ -2819,6 +2800,9 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
		if inList(lib, deps.ExcludeLibsForApex) {
		depTag.excludeInApex = true
		}
		if inList(lib, deps.ExcludeLibsForNonApex) {
		depTag.excludeInNonApex = true
		}

		name, version := StubsLibNameAndVersion(lib)
		if apiLibraryName, ok := apiImportInfo.SharedLibs[name]; ok && !ctx.OtherModuleExists(name) {
		@@ -3335,6 +3319,9 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
		if !apexInfo.IsForPlatform() && libDepTag.excludeInApex {
		return
		}
		if apexInfo.IsForPlatform() && libDepTag.excludeInNonApex {
		return
		}

		depExporterInfo := ctx.OtherModuleProvider(dep, FlagExporterInfoProvider).(FlagExporterInfo)

		@@ -4323,7 +4310,6 @@ func DefaultsFactory(props ...interface{}) android.Module {
		&VndkProperties{},
		&LTOProperties{},
		&AfdoProperties{},
		&PgoProperties{},
		&OrderfileProperties{},
		&android.ProtoProperties{},
		// RustBindgenProperties is included here so that cc_defaults can be used for rust_bindgen modules.