diff options
| author | 2024-12-17 14:19:19 -0800 | |
|---|---|---|
| committer | 2024-12-17 14:19:19 -0800 | |
| commit | e935d45ef4f092551b1ffa579e88867efcf4f884 (patch) | |
| tree | 654e6f238f99fd62ffcc7482e21bb2591578e2c9 /api/api.go | |
| parent | 07205b96526d8dda0716f67f1a0a4c97964752e9 (diff) | |
| parent | 1a34e9431fbbe69deb65e01ce6a80db10b44f264 (diff) | |
Merge "Convert CombinedApis's GenerateAndroidBuildActions to use ModuleProxy." into main am: d8c9b4edf7 am: 1a34e9431f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3414380
Change-Id: I7aad646c118e81c6f0576751f3746358f0d63616
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api.go b/api/api.go index e4d783eba4c3..cbdb7e81ab86 100644 --- a/api/api.go +++ b/api/api.go @@ -105,7 +105,7 @@ func (a *CombinedApis) DepsMutator(ctx android.BottomUpMutatorContext) { func (a *CombinedApis) GenerateAndroidBuildActions(ctx android.ModuleContext) { ctx.WalkDeps(func(child, parent android.Module) bool { - if _, ok := child.(java.AndroidLibraryDependency); ok && child.Name() != "framework-res" { + if _, ok := android.OtherModuleProvider(ctx, child, java.AndroidLibraryInfoProvider); ok && 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( |