diff options
| author | 2025-01-13 16:19:15 -0800 | |
|---|---|---|
| committer | 2025-01-13 16:19:15 -0800 | |
| commit | a783122642c3c57d739a731953029f7c2b1c32c7 (patch) | |
| tree | a5146d950181d5710533b9270a33529fd96fcb1c /api/api.go | |
| parent | 22294fcbced262901782c0b1bbeb10816a98fcf5 (diff) | |
| parent | f920cc5d8e967ec9359269dbde084eed5b979118 (diff) | |
Merge "Change CombinedApis to actually use WalkDepsProxy, also uses the newly added AndroidLibraryDependencyInfo." into main am: f920cc5d8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446190
Change-Id: Ie3f92e0b402bf6c7a1cfe23b724ab28f4f412845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api.go')
| -rw-r--r-- | api/api.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/api.go b/api/api.go index b8f30a242320..da75e05673e2 100644 --- a/api/api.go +++ b/api/api.go @@ -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( |