diff options
| author | 2025-01-13 16:43:20 -0800 | |
|---|---|---|
| committer | 2025-01-13 16:43:20 -0800 | |
| commit | a505087cf5bdd8f8018b2f449380b24d6632f017 (patch) | |
| tree | ef9f17820b4c16108370ae4a6f27d4cb1837186e /api/api.go | |
| parent | 2830d7efbec37301c5405037c4cb1d8261d23370 (diff) | |
| parent | a783122642c3c57d739a731953029f7c2b1c32c7 (diff) | |
Merge "Change CombinedApis to actually use WalkDepsProxy, also uses the newly added AndroidLibraryDependencyInfo." into main am: f920cc5d8e am: a783122642
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3446190
Change-Id: I72d0059f4170d0b4bb3291fa85ea80d3ffcd91ec
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 cbdb7e81ab86..640773be0f9b 100644 --- a/api/api.go +++ b/api/api.go @@ -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( |