diff options
| author | 2023-11-07 10:53:46 +0000 | |
|---|---|---|
| committer | 2023-11-07 10:53:46 +0000 | |
| commit | 1bff7958b41a654b19ee1eb1fdee972040d38fc8 (patch) | |
| tree | d36aab633023f0f808f3c5fdfd1482a05cd1b95b /api/StubLibraries.bp | |
| parent | a42569ab26692a0c2f1b9b20f6567666defd3b05 (diff) | |
| parent | 92ba7fca7395a380480b1580ca322b95e43cbf5a (diff) | |
Merge "Share list of libs to depend on for APIs" into main am: 92ba7fca73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817545
Change-Id: If54c72d46bb927168dfbafa323513a7126ec5864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/StubLibraries.bp')
| -rw-r--r-- | api/StubLibraries.bp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index 5688b968db87..f6f69291ce0e 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -351,17 +351,7 @@ java_library { "android-non-updatable_from_source_defaults", ], 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_system_current_android", - ], + libs: non_updatable_api_deps_on_modules, dist: { dir: "apistubs/android/module-lib", }, |