From 648b0db8cb1118c88b085e2844fc8ae92f163942 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 6 Nov 2023 19:24:42 +0000 Subject: Share list of libs to depend on for APIs The non-updatable part of the API has a few deps on module APIs. Extract the list of libs to satisfy those deps into a variable so that it can be shared between the stubs_default and the java_library. Test: m Change-Id: Id416d294150131b477fc9c73a2d5811cfbf7012f --- api/StubLibraries.bp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'api/StubLibraries.bp') 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", }, -- cgit v1.2.3-59-g8ed1b