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

Commit a7831226 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

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



Change-Id: Ie3f92e0b402bf6c7a1cfe23b724ab28f4f412845
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22294fcb f920cc5d

api/api.go

+3 −2
Original line number Diff line number Diff line
@@ -102,8 +102,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(