From ce21e28bfce65f83359babcdb4b5a16a64e4da4d Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 5 Feb 2021 11:38:30 +0000 Subject: [PATCH] Update references to prebuilt sdks to use "current" This facilities easier updating when new classes get added. Bug: 177266501 Test: m Change-Id: I85b3832681f0455093d2a33ace7dbc1028a1a5ff --- StubLibraries.bp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/StubLibraries.bp b/StubLibraries.bp index 6afed7a78a08c..f56de1a962f14 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -79,12 +79,11 @@ stubs_defaults { "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, - // this may be need to be revisited to use a manually maintained stub - // library with empty classes in order to resolve those references. - "sdk_system_30_android", + // There are a few classes from modules used by the core that + // need to be resolved by metalava. We use a prebuilt stub of the + // full sdk to ensure we can resolve them. If a new class gets added, + // the prebuilts/sdk/current needs to be updated. + "sdk_system_current_android", ], high_mem: true, // Lots of sources => high memory use, see b/170701554 installable: false, @@ -392,7 +391,7 @@ java_library_static { "android_defaults_stubs_current", "android_stubs_dists_default", ], - libs: ["sdk_system_29_android"], + libs: ["sdk_system_current_android"], static_libs: ["art.module.public.api.stubs"], dist: { dir: "apistubs/android/module-lib",