diff options
| author | 2025-01-10 19:08:54 +0000 | |
|---|---|---|
| committer | 2025-01-10 19:08:54 +0000 | |
| commit | d3614e040d596cf6fa4435a43ddbfbfe8563a59f (patch) | |
| tree | 17bea1ecf42b5a877585b7f36e91be7de9846db7 /api/api.go | |
| parent | a9e2d996d1dc63c00174002fb4bf75f05a89214c (diff) | |
Change CombinedApis to actually use WalkDepsProxy, also uses the newly
added AndroidLibraryDependencyInfo.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Iad4013d3212e8f575dd55bcfec0e2b659ae0d8db
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( |