Merge "Remove some uses of ApexContents" into main (994d8d89) · Commits · e / os / android_build_soong

android/apex.go

+0 −22

Original line number	Diff line number	Diff line
		@@ -870,28 +870,6 @@ func (i ApexMembership) merge(other ApexMembership) ApexMembership {
		return notInApex
		}

		// Tests whether a module named moduleName is directly included in the apexBundle where this
		// ApexContents is tagged.
		func (ac *ApexContents) DirectlyInApex(moduleName string) bool {
		return ac.contents[moduleName] == directlyInApex
		}

		// Tests whether a module named moduleName is included in the apexBundle where this ApexContent is
		// tagged.
		func (ac *ApexContents) InApex(moduleName string) bool {
		return ac.contents[moduleName] != notInApex
		}

		// Tests whether a module named moduleName is directly depended on by all APEXes in an ApexInfo.
		func DirectlyInAllApexes(apexInfo ApexInfo, moduleName string) bool {
		for _, contents := range apexInfo.ApexContents {
		if !contents.DirectlyInApex(moduleName) {
		return false
		}
		}
		return true
		}

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

apex/apex.go

+6 −4

Original line number	Diff line number	Diff line
		@@ -2071,8 +2071,7 @@ func (a apexBundle) depVisitor(vctx visitorContext, ctx android.ModuleContext,
		af := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs)
		af.transitiveDep = true

		abInfo, _ := android.ModuleProvider(ctx, android.ApexBundleInfoProvider)
		if !abInfo.Contents.DirectlyInApex(depName) && (ch.IsStubs() \|\| ch.HasStubsVariants()) {
		if ch.IsStubs() \|\| ch.HasStubsVariants() {
		// If the dependency is a stubs lib, don't include it in this APEX,
		// but make sure that the lib is installed on the device.
		// In case no APEX is having the lib, the lib is installed to the system
		@@ -2576,7 +2575,10 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext
		return
		}

		abInfo, _ := android.ModuleProvider(ctx, android.ApexBundleInfoProvider)
		librariesDirectlyInApex := make(map[string]bool)
		ctx.VisitDirectDepsProxyWithTag(sharedLibTag, func(dep android.ModuleProxy) {
		librariesDirectlyInApex[ctx.OtherModuleName(dep)] = true
		})

		a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		if ccm, ok := to.(*cc.Module); ok {
		@@ -2602,7 +2604,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext
		return false
		}

		isStubLibraryFromOtherApex := ccm.HasStubsVariants() && !abInfo.Contents.DirectlyInApex(toName)
		isStubLibraryFromOtherApex := ccm.HasStubsVariants() && !librariesDirectlyInApex[toName]
		if isStubLibraryFromOtherApex && !externalDep {
		ctx.ModuleErrorf("%q required by %q is a native library providing stub. "+
		"It shouldn't be included in this APEX via static linking. Dependency path: %s", to.String(), fromName, ctx.GetPathString(false))