Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make non-updatable stubs depend on sdk 29" into rvc-dev am: d42b7dd9df am: 3be3a8c822 am: 5de2ad38b3

Browse Source 
Change-Id: Ic70f88685a0f2b263a20171714b0da5272dd9146
This commit is contained in:
Anton Hansson
2020-04-17 08:46:05 +00:00
committed by Automerger Merge Worker
parent 8b0787ee53 5de2ad38b3
commit b2769e9c36
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
StubLibraries.bp
View File

@@ -77,9 +77,14 @@ stubs_defaults {
name: "metalava-non-updatable-api-stubs-default", name: "metalava-non-updatable-api-stubs-default",
defaults: ["metalava-base-api-stubs-default"], defaults: ["metalava-base-api-stubs-default"],
sdk_version: "core_platform", sdk_version: "core_platform",
libs: ["framework-all"], // 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.
libs: ["sdk_system_29_android"],
aidl: { aidl: {
local_include_dirs: ["apex/media/framework/java"], local_include_dirs: ["apex/media/aidl/stable"],
}, },
} }
@@ -301,7 +306,7 @@ java_library_static {
name: "android_module_lib_stubs_current", name: "android_module_lib_stubs_current",
srcs: [ ":module-lib-api-stubs-docs" ], srcs: [ ":module-lib-api-stubs-docs" ],
defaults: ["android_defaults_stubs_current"], defaults: ["android_defaults_stubs_current"],
libs: ["android_system_stubs_current"], libs: ["sdk_system_29_android"],
} }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////