diff options
Diffstat (limited to 'StubLibraries.bp')
| -rw-r--r-- | StubLibraries.bp | 70 |
1 files changed, 64 insertions, 6 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 14da6fbcd69c..77b26f80ab97 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -23,6 +23,14 @@ // and comparing them against the checked in API signature, and also checking compatibility // with the latest frozen API signature. +// TODO(b/21090328): Remove filter after we are ready to. +soong_config_module_type_import { + from: "frameworks/base/Android.bp", + module_types: [ + "java_library_with_nonpublic_deps", + ], +} + ///////////////////////////////////////////////////////////////////// // Common metalava configs ///////////////////////////////////////////////////////////////////// @@ -212,15 +220,19 @@ modules_public_stubs = [ "conscrypt.module.public.api.stubs", "framework-appsearch.stubs", "framework-connectivity.stubs", + "framework-connectivity-tiramisu.stubs", "framework-graphics.stubs", "framework-media.stubs", "framework-mediaprovider.stubs", + "framework-nearby.stubs", "framework-permission.stubs", "framework-permission-s.stubs", "framework-scheduling.stubs", "framework-sdkextensions.stubs", "framework-statsd.stubs", + "framework-supplementalprocess.stubs", "framework-tethering.stubs", + "framework-uwb.stubs", "framework-wifi.stubs", "i18n.module.public.api.stubs", ] @@ -231,15 +243,19 @@ modules_system_stubs = [ "conscrypt.module.public.api.stubs", // Only has public stubs "framework-appsearch.stubs.system", "framework-connectivity.stubs.system", + "framework-connectivity-tiramisu.stubs.system", "framework-graphics.stubs.system", "framework-media.stubs.system", "framework-mediaprovider.stubs.system", + "framework-nearby.stubs.system", "framework-permission.stubs.system", "framework-permission-s.stubs.system", "framework-scheduling.stubs.system", "framework-sdkextensions.stubs.system", "framework-statsd.stubs.system", + "framework-supplementalprocess.stubs", "framework-tethering.stubs.system", + "framework-uwb.stubs.system", "framework-wifi.stubs.system", "i18n.module.public.api.stubs", // Only has public stubs ] @@ -261,21 +277,35 @@ java_defaults { visibility: ["//visibility:private"], } -java_library { +java_library_with_nonpublic_deps { name: "android-non-updatable.stubs", defaults: ["android-non-updatable_defaults_stubs_current"], srcs: [":api-stubs-docs-non-updatable"], libs: modules_public_stubs, + soong_config_variables: { + include_nonpublic_framework_api: { + libs: [ + "framework-supplementalapi.stubs", + ], + }, + }, dist: { dir: "apistubs/android/public", }, } -java_library { +java_library_with_nonpublic_deps { name: "android-non-updatable.stubs.system", defaults: ["android-non-updatable_defaults_stubs_current"], srcs: [":system-api-stubs-docs-non-updatable"], libs: modules_system_stubs, + soong_config_variables: { + include_nonpublic_framework_api: { + libs: [ + "framework-supplementalapi.stubs", + ], + }, + }, dist: { dir: "apistubs/android/system", }, @@ -296,11 +326,18 @@ java_library { }, } -java_library { +java_library_with_nonpublic_deps { name: "android-non-updatable.stubs.test", defaults: ["android-non-updatable_defaults_stubs_current"], srcs: [":test-api-stubs-docs-non-updatable"], libs: modules_system_stubs, + soong_config_variables: { + include_nonpublic_framework_api: { + libs: [ + "framework-supplementalapi.stubs", + ], + }, + }, dist: { dir: "apistubs/android/test", }, @@ -316,21 +353,35 @@ java_defaults { defaults_visibility: ["//frameworks/base/services"], } -java_library { +java_library_with_nonpublic_deps { name: "android_stubs_current", static_libs: modules_public_stubs + [ "android-non-updatable.stubs", "private-stub-annotations-jar", ], + soong_config_variables: { + include_nonpublic_framework_api: { + static_libs: [ + "framework-supplementalapi.stubs", + ], + }, + }, defaults: ["android.jar_defaults"], } -java_library { +java_library_with_nonpublic_deps { name: "android_system_stubs_current", static_libs: modules_system_stubs + [ "android-non-updatable.stubs.system", "private-stub-annotations-jar", ], + soong_config_variables: { + include_nonpublic_framework_api: { + static_libs: [ + "framework-supplementalapi.stubs", + ], + }, + }, defaults: [ "android.jar_defaults", "android_stubs_dists_default", @@ -348,7 +399,7 @@ java_library { ], } -java_library { +java_library_with_nonpublic_deps { 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. @@ -356,6 +407,13 @@ java_library { "android-non-updatable.stubs.test", "private-stub-annotations-jar", ], + soong_config_variables: { + include_nonpublic_framework_api: { + static_libs: [ + "framework-supplementalapi.stubs", + ], + }, + }, defaults: [ "android.jar_defaults", "android_stubs_dists_default", |