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

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

Merge "Change CombinedApis to actually use WalkDepsProxy, also uses the newly... 

Merge "Change CombinedApis to actually use WalkDepsProxy, also uses the newly added AndroidLibraryDependencyInfo." into main am: f920cc5d am: a7831226

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446190



Change-Id: I72d0059f4170d0b4bb3291fa85ea80d3ffcd91ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2830d7ef a7831226

api/api.go

+3 −2
Original line number Diff line number Diff line
@@ -104,8 +104,9 @@ func (a *CombinedApis) DepsMutator(ctx android.BottomUpMutatorContext) { 
}



func (a *CombinedApis) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	ctx.WalkDeps(func(child, parent android.Module) bool {

		if _, ok := android.OtherModuleProvider(ctx, child, java.AndroidLibraryInfoProvider); ok && child.Name() != "framework-res" {

	ctx.WalkDepsProxy(func(child, parent android.ModuleProxy) bool {

		javaInfo, ok := android.OtherModuleProvider(ctx, child, java.JavaInfoProvider)

		if ok && javaInfo.AndroidLibraryDependencyInfo != nil && child.Name() != "framework-res" {

			// Stubs of BCP and SSCP libraries should not have any dependencies on apps

			// This check ensures that we do not run into circular dependencies when UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true

			ctx.ModuleErrorf(