Remove ApexContents (bb674a19) · Commits · e / os / android_build_soong

android/apex.go

+0 −58

Original line number	Diff line number	Diff line
		@@ -70,11 +70,6 @@ type ApexInfo struct {
		// prebuilt, the name here doesn't have the `prebuilt_` prefix.
		InApexModules []string

		// Pointers to the ApexContents struct each of which is for apexBundle modules that this
		// module is part of. The ApexContents gives information about which modules the apexBundle
		// has and whether a module became part of the apexBundle via a direct dependency or not.
		ApexContents []*ApexContents

		// True if this is for a prebuilt_apex.
		//
		// If true then this will customize the apex processing to make it suitable for handling
		@@ -162,7 +157,6 @@ func (i ApexInfo) Equal(other any) bool {

		// ApexBundleInfo contains information about the dependencies of an apex
		type ApexBundleInfo struct {
		Contents *ApexContents
		}

		var ApexBundleInfoProvider = blueprint.NewMutatorProvider[ApexBundleInfo]("apex_info")
		@@ -553,7 +547,6 @@ func mergeApexVariations(apexInfos []ApexInfo) (merged []ApexInfo, aliases [][2]
		// Variants having the same mergedName are deduped
		merged[index].InApexVariants = append(merged[index].InApexVariants, variantName)
		merged[index].InApexModules = append(merged[index].InApexModules, apexInfo.InApexModules...)
		merged[index].ApexContents = append(merged[index].ApexContents, apexInfo.ApexContents...)
		merged[index].Updatable = merged[index].Updatable \|\| apexInfo.Updatable
		// Platform APIs is allowed for this module only when all APEXes containing
		// the module are with `use_platform_apis: true`.
		@@ -564,7 +557,6 @@ func mergeApexVariations(apexInfos []ApexInfo) (merged []ApexInfo, aliases [][2]
		apexInfo.ApexVariationName = mergedName
		apexInfo.InApexVariants = CopyOf(apexInfo.InApexVariants)
		apexInfo.InApexModules = CopyOf(apexInfo.InApexModules)
		apexInfo.ApexContents = append([]*ApexContents(nil), apexInfo.ApexContents...)
		apexInfo.TestApexes = CopyOf(apexInfo.TestApexes)
		merged = append(merged, apexInfo)
		}
		@@ -743,56 +735,6 @@ func UpdateUniqueApexVariationsForDeps(mctx BottomUpMutatorContext, am ApexModul
		})
		}

		// ApexMembership tells how a module became part of an APEX.
		type ApexMembership int

		const (
		notInApex ApexMembership = 0
		indirectlyInApex = iota
		directlyInApex
		)

		// ApexContents gives an information about member modules of an apexBundle. Each apexBundle has an
		// apexContents, and modules in that apex have a provider containing the apexContents of each
		// apexBundle they are part of.
		type ApexContents struct {
		// map from a module name to its membership in this apexBundle
		contents map[string]ApexMembership
		}

		// NewApexContents creates and initializes an ApexContents that is suitable
		// for use with an apex module.
		// - contents is a map from a module name to information about its membership within
		// the apex.
		func NewApexContents(contents map[string]ApexMembership) *ApexContents {
		return &ApexContents{
		contents: contents,
		}
		}

		// Updates an existing membership by adding a new direct (or indirect) membership
		func (i ApexMembership) Add(direct bool) ApexMembership {
		if direct \|\| i == directlyInApex {
		return directlyInApex
		}
		return indirectlyInApex
		}

		// Merges two membership into one. Merging is needed because a module can be a part of an apexBundle
		// in many different paths. For example, it could be dependend on by the apexBundle directly, but at
		// the same time, there might be an indirect dependency to the module. In that case, the more
		// specific dependency (the direct one) is chosen.
		func (i ApexMembership) merge(other ApexMembership) ApexMembership {
		if other == directlyInApex \|\| i == directlyInApex {
		return directlyInApex
		}

		if other == indirectlyInApex \|\| i == indirectlyInApex {
		return indirectlyInApex
		}
		return notInApex
		}

		////////////////////////////////////////////////////////////////////////////////////////////////////
		//Below are routines for extra safety checks.
		//

apex/apex.go

+1 −20

Original line number	Diff line number	Diff line
		@@ -992,25 +992,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
		return true
		}

		// Records whether a certain module is included in this apexBundle via direct dependency or
		// inndirect dependency.
		contents := make(map[string]android.ApexMembership)
		mctx.WalkDeps(func(child, parent android.Module) bool {
		if !continueApexDepsWalk(child, parent) {
		return false
		}
		// If the parent is apexBundle, this child is directly depended.
		_, directDep := parent.(*apexBundle)
		depName := mctx.OtherModuleName(child)
		contents[depName] = contents[depName].Add(directDep)
		return true
		})

		// The membership information is saved for later access
		apexContents := android.NewApexContents(contents)
		android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{
		Contents: apexContents,
		})
		android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{})

		minSdkVersion := a.minSdkVersion(mctx)
		// When min_sdk_version is not set, the apex is built against FutureApiLevel.
		@@ -1039,7 +1021,6 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
		UsePlatformApis: a.UsePlatformApis(),
		InApexVariants: []string{apexVariationName},
		InApexModules: []string{a.Name()}, // could be com.mycompany.android.foo
		ApexContents: []*android.ApexContents{apexContents},
		TestApexes: testApexes,
		BaseApexName: mctx.ModuleName(),
		ApexAvailableName: proptools.String(a.properties.Apex_available_name),

apex/prebuilt.go

+1 −14

Original line number	Diff line number	Diff line
		@@ -306,10 +306,6 @@ func (p *prebuiltCommon) DepIsInSameApex(ctx android.BaseModuleContext, dep andr
		// extra copying of files. Contrast that with source apex modules that has to build each variant
		// from source.
		func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {

		// Collect direct dependencies into contents.
		contents := make(map[string]android.ApexMembership)

		// Collect the list of dependencies.
		var dependencies []android.ApexModule
		mctx.WalkDeps(func(child, parent android.Module) bool {
		@@ -347,21 +343,13 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
		// behavior whether there is a corresponding source module present or not.
		depName = android.RemoveOptionalPrebuiltPrefix(depName)

		// Remember if this module was added as a direct dependency.
		direct := parent == mctx.Module()
		contents[depName] = contents[depName].Add(direct)

		// Add the module to the list of dependencies that need to have an APEX variant.
		dependencies = append(dependencies, child.(android.ApexModule))

		return true
		})

		// Create contents for the prebuilt_apex and store it away for later use.
		apexContents := android.NewApexContents(contents)
		android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{
		Contents: apexContents,
		})
		android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{})

		// Create an ApexInfo for the prebuilt_apex.
		apexVariationName := p.ApexVariationName()
		@@ -369,7 +357,6 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
		ApexVariationName: apexVariationName,
		InApexVariants: []string{apexVariationName},
		InApexModules: []string{p.BaseModuleName()}, // BaseModuleName() to avoid the prebuilt_ prefix.
		ApexContents: []*android.ApexContents{apexContents},
		ForPrebuiltApex: true,
		}