diff options
Diffstat (limited to 'StubLibraries.bp')
| -rw-r--r-- | StubLibraries.bp | 86 |
1 files changed, 27 insertions, 59 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 14da6fbcd69c..5cb0a785bc2b 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -24,23 +24,15 @@ // with the latest frozen API signature. ///////////////////////////////////////////////////////////////////// -// Common metalava configs -///////////////////////////////////////////////////////////////////// - -stubs_defaults { - name: "metalava-non-updatable-api-stubs-default", - defaults: ["android-non-updatable-stubs-defaults"], - api_levels_annotations_enabled: false, - defaults_visibility: ["//visibility:private"], -} - -///////////////////////////////////////////////////////////////////// // These modules provide source files for the stub libraries ///////////////////////////////////////////////////////////////////// droidstubs { name: "api-stubs-docs-non-updatable", - defaults: ["metalava-non-updatable-api-stubs-default"], + defaults: [ + "android-non-updatable-stubs-defaults", + "module-classpath-stubs-defaults", + ], args: metalava_framework_docs_args, check_api: { current: { @@ -89,7 +81,10 @@ module_libs = " --show-annotation android.annotation.SystemApi\\(" + droidstubs { name: "system-api-stubs-docs-non-updatable", - defaults: ["metalava-non-updatable-api-stubs-default"], + defaults: [ + "android-non-updatable-stubs-defaults", + "module-classpath-stubs-defaults", + ], args: metalava_framework_docs_args + priv_apps, check_api: { current: { @@ -125,7 +120,10 @@ droidstubs { droidstubs { name: "test-api-stubs-docs-non-updatable", - defaults: ["metalava-non-updatable-api-stubs-default"], + defaults: [ + "android-non-updatable-stubs-defaults", + "module-classpath-stubs-defaults", + ], args: metalava_framework_docs_args + test + priv_apps_in_stubs, check_api: { current: { @@ -167,7 +165,10 @@ droidstubs { droidstubs { name: "module-lib-api-stubs-docs-non-updatable", - defaults: ["metalava-non-updatable-api-stubs-default"], + defaults: [ + "android-non-updatable-stubs-defaults", + "module-classpath-stubs-defaults", + ], args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs, check_api: { current: { @@ -206,44 +207,6 @@ droidstubs { // from stub sources ///////////////////////////////////////////////////////////////////// -modules_public_stubs = [ - "android.net.ipsec.ike.stubs", - "art.module.public.api.stubs", - "conscrypt.module.public.api.stubs", - "framework-appsearch.stubs", - "framework-connectivity.stubs", - "framework-graphics.stubs", - "framework-media.stubs", - "framework-mediaprovider.stubs", - "framework-permission.stubs", - "framework-permission-s.stubs", - "framework-scheduling.stubs", - "framework-sdkextensions.stubs", - "framework-statsd.stubs", - "framework-tethering.stubs", - "framework-wifi.stubs", - "i18n.module.public.api.stubs", -] - -modules_system_stubs = [ - "android.net.ipsec.ike.stubs.system", - "art.module.public.api.stubs.system", - "conscrypt.module.public.api.stubs", // Only has public stubs - "framework-appsearch.stubs.system", - "framework-connectivity.stubs.system", - "framework-graphics.stubs.system", - "framework-media.stubs.system", - "framework-mediaprovider.stubs.system", - "framework-permission.stubs.system", - "framework-permission-s.stubs.system", - "framework-scheduling.stubs.system", - "framework-sdkextensions.stubs.system", - "framework-statsd.stubs.system", - "framework-tethering.stubs.system", - "framework-wifi.stubs.system", - "i18n.module.public.api.stubs", // Only has public stubs -] - java_defaults { name: "android-non-updatable_defaults_stubs_current", libs: ["stub-annotations"], @@ -265,7 +228,7 @@ java_library { name: "android-non-updatable.stubs", defaults: ["android-non-updatable_defaults_stubs_current"], srcs: [":api-stubs-docs-non-updatable"], - libs: modules_public_stubs, + libs: ["all-modules-public-stubs"], dist: { dir: "apistubs/android/public", }, @@ -275,7 +238,7 @@ java_library { name: "android-non-updatable.stubs.system", defaults: ["android-non-updatable_defaults_stubs_current"], srcs: [":system-api-stubs-docs-non-updatable"], - libs: modules_system_stubs, + libs: ["all-modules-system-stubs"], dist: { dir: "apistubs/android/system", }, @@ -287,6 +250,8 @@ java_library { srcs: [":module-lib-api-stubs-docs-non-updatable"], libs: [ "sdk_module-lib_current_framework-tethering", + "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", @@ -300,7 +265,7 @@ java_library { name: "android-non-updatable.stubs.test", defaults: ["android-non-updatable_defaults_stubs_current"], srcs: [":test-api-stubs-docs-non-updatable"], - libs: modules_system_stubs, + libs: ["all-modules-system-stubs"], dist: { dir: "apistubs/android/test", }, @@ -318,7 +283,8 @@ java_defaults { java_library { name: "android_stubs_current", - static_libs: modules_public_stubs + [ + static_libs: [ + "all-modules-public-stubs", "android-non-updatable.stubs", "private-stub-annotations-jar", ], @@ -327,7 +293,8 @@ java_library { java_library { name: "android_system_stubs_current", - static_libs: modules_system_stubs + [ + static_libs: [ + "all-modules-system-stubs", "android-non-updatable.stubs.system", "private-stub-annotations-jar", ], @@ -352,7 +319,8 @@ java_library { name: "android_test_stubs_current", // Modules do not have test APIs, but we want to include their SystemApis, like we include // the SystemApi of framework-non-updatable-sources. - static_libs: modules_system_stubs + [ + static_libs: [ + "all-modules-system-stubs", "android-non-updatable.stubs.test", "private-stub-annotations-jar", ], |