diff options
| author | Anton Hansson <hansson@google.com> | 2023-10-03 15:09:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-03 15:09:51 +0000 |
| commit | e1d899f2ad626b918d3658f33f84fd7103aabb53 (patch) | |
| tree | e3720e8c2c434ce117d4b7614d520cc0c7d9eff4 | |
| parent | 2768c06f7a8723505cea678706900cbd5f91e615 (diff) | |
| parent | 8b49d0ecaf3a07f42a30e7746c8ce8b3185ad53b (diff) | |
| download | base-e1d899f2ad626b918d3658f33f84fd7103aabb53.tar.gz | |
Merge "Clean up prebuilt stub deps & add comment" into main
| -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 8b535926a8e7..180a41c68709 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", |