diff options
Diffstat (limited to 'StubLibraries.bp')
| -rw-r--r-- | StubLibraries.bp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 6cabc573659e..ed8781e2ff86 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -47,10 +47,11 @@ stubs_defaults { "core/java/**/*.logtags", ":opt-telephony-srcs", ":opt-net-voip-srcs", - ":art.module.public.api{.public.stubs.source}", "**/package.html", ], - sdk_version: "core_platform", + sdk_version: "none", + system_modules: "none", + java_version: "1.8", arg_files: ["core/res/AndroidManifest.xml"], // TODO(b/147699819): remove below aidl includes. aidl: { @@ -77,6 +78,7 @@ stubs_defaults { "android.hardware.usb.gadget-V1.0-java", "android.hardware.vibrator-V1.3-java", "framework-protos", + "stable.core.platform.api.stubs", // There are a few classes from modules used as type arguments that // need to be resolved by metalava. For now, we can use a previously // finalized stub library to resolve them. If a new class gets added, @@ -237,6 +239,7 @@ java_library_static { name: "android_stubs_current", srcs: [ ":api-stubs-docs-non-updatable" ], static_libs: [ + "art.module.public.api.stubs", "conscrypt.module.public.api.stubs", "framework-media.stubs", "framework-mediaprovider.stubs", @@ -255,6 +258,7 @@ java_library_static { name: "android_system_stubs_current", srcs: [ ":system-api-stubs-docs-non-updatable" ], static_libs: [ + "art.module.public.api.stubs", "conscrypt.module.public.api.stubs", "framework-media.stubs.system", "framework-mediaprovider.stubs.system", @@ -289,6 +293,7 @@ java_library_static { static_libs: [ // Modules do not have test APIs, but we want to include their SystemApis, like we include // the SystemApi of framework-non-updatable-sources. + "art.module.public.api.stubs", "conscrypt.module.public.api.stubs", "framework-media.stubs.system", "framework-mediaprovider.stubs.system", @@ -325,25 +330,12 @@ java_library_static { "android_stubs_dists_default", ], libs: ["sdk_system_29_android"], + static_libs: ["art.module.public.api.stubs"], dist: { dir: "apistubs/android/module-lib", }, } -java_library_static { - name: "android_non_updatable_stubs_current", - srcs: [":api-stubs-docs-non-updatable"], - defaults: ["android_defaults_stubs_current"], - libs: ["sdk_system_29_android"], -} - -java_library_static { - name: "android_system_non_updatable_stubs_current", - srcs: [":system-api-stubs-docs-non-updatable"], - defaults: ["android_defaults_stubs_current"], - libs: ["sdk_system_29_android"], -} - ///////////////////////////////////////////////////////////////////// // hwbinder.stubs provides APIs required for building HIDL Java // libraries. |