diff options
| author | Anton Hansson <hansson@google.com> | 2023-10-03 15:52:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-03 15:52:19 +0000 |
| commit | b6bb6b70d94ed44a8d764d9f1074f8b096ab3930 (patch) | |
| tree | 7bdb32054d937d2b394bbbdcca1a20aa3d3201b5 | |
| parent | 9cdf7de28248b2866a0be1d73e717c0e6f650c15 (diff) | |
| parent | e1d899f2ad626b918d3658f33f84fd7103aabb53 (diff) | |
| download | base-b6bb6b70d94ed44a8d764d9f1074f8b096ab3930.tar.gz | |
Merge "Clean up prebuilt stub deps & add comment" into main am: e1d899f2ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2767025
Change-Id: Icb77f840a20755fa0a3245345d319c044a694ddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | api/StubLibraries.bp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index f69f33f7df69..857077d60a5d 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -357,13 +357,15 @@ java_library { ], srcs: [":module-lib-api-stubs-docs-non-updatable"], libs: [ + // We cannot depend on all-modules-module-lib-stubs, because the module-lib stubs + // depend on this stub. We resolve dependencies on APIs in modules by depending + // on a prebuilt of the whole platform (sdk_system_current_android). + // That prebuilt does not include module-lib APIs, so use the prebuilt module-lib + // stubs for modules that export module-lib stubs that the non-updatable part + // depends on. "sdk_module-lib_current_framework-tethering", "sdk_module-lib_current_framework-connectivity-t", - "sdk_public_current_framework-bluetooth", - // NOTE: The below can be removed once the prebuilt stub contains bluetooth. "sdk_system_current_android", - // NOTE: The below can be removed once the prebuilt stub contains IKE. - "sdk_system_current_android.net.ipsec.ike", ], dist: { dir: "apistubs/android/module-lib", |