Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198be083 authored by Yu Liu's avatar Yu Liu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "verifyNativeImplementationLibs" into main am: 9585f8e8 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3390959



Change-Id: I12facdeaa707fe78d9cea7e18371b0603cb4df15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c969f7d8 9585f8e8

apex/apex.go

+3 −3
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ func (vctx *visitorContext) normalizeFileInfo(mctx android.ModuleContext) { 
// as the apex.

func (a *apexBundle) enforcePartitionTagOnApexSystemServerJar(ctx android.ModuleContext) {

	global := dexpreopt.GetGlobalConfig(ctx)

	ctx.VisitDirectDepsWithTag(sscpfTag, func(child android.Module) {

	ctx.VisitDirectDepsProxyWithTag(sscpfTag, func(child android.ModuleProxy) {

		info, ok := android.OtherModuleProvider(ctx, child, java.LibraryNameToPartitionInfoProvider)

		if !ok {

			ctx.ModuleErrorf("Could not find partition info of apex system server jars.")
@@ -2297,7 +2297,7 @@ func (a *apexBundle) providePrebuiltInfo(ctx android.ModuleContext) { 
// Apexes built from source retrieve this information by visiting `bootclasspath_fragments`

// Used by dex_bootjars to generate the boot image

func (a *apexBundle) provideApexExportsInfo(ctx android.ModuleContext) {

	ctx.VisitDirectDepsWithTag(bcpfTag, func(child android.Module) {

	ctx.VisitDirectDepsProxyWithTag(bcpfTag, func(child android.ModuleProxy) {

		if info, ok := android.OtherModuleProvider(ctx, child, java.BootclasspathFragmentApexContentInfoProvider); ok {

			exports := android.ApexExportsInfo{

				ApexName:                      a.ApexVariationName(),
@@ -2873,7 +2873,7 @@ func (a *apexBundle) verifyNativeImplementationLibs(ctx android.ModuleContext) { 
	}



	var appEmbeddedJNILibs android.Paths

	ctx.VisitDirectDeps(func(dep android.Module) {

	ctx.VisitDirectDepsProxy(func(dep android.ModuleProxy) {

		tag := ctx.OtherModuleDependencyTag(dep)

		if !checkApexTag(tag) {

			return