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

Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead am: 2f20e9afe7 am: 10d116d1ec am: 2cb250d6a5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799

Change-Id: I508f04191182df39edf9ec1d0d7bab3e59e5b2bf
This commit is contained in:
Makoto Onuki
2020-07-16 17:27:09 +00:00
committed by Automerger Merge Worker
parent fdabd6120c 2cb250d6a5
commit 64c0906ecd
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
StubLibraries.bp
View File

@@ -239,11 +239,6 @@ droidstubs {
// namely @SystemApi(client=MODULE_LIBRARIES) APIs. // namely @SystemApi(client=MODULE_LIBRARIES) APIs.
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// TODO(b/146727827) remove the *-api module when we can teach metalava
// about the relationship among the API surfaces. Currently, these modules are only to generate
// the API signature files and ensure that the APIs evolve in a backwards compatible manner.
// They however are NOT used for building the API stub.
droidstubs { droidstubs {
name: "module-lib-api", name: "module-lib-api",
defaults: ["metalava-full-api-stubs-default"], defaults: ["metalava-full-api-stubs-default"],
@@ -280,7 +275,7 @@ droidstubs {
name: "module-lib-api-stubs-docs-non-updatable", name: "module-lib-api-stubs-docs-non-updatable",
defaults: ["metalava-non-updatable-api-stubs-default"], defaults: ["metalava-non-updatable-api-stubs-default"],
arg_files: ["core/res/AndroidManifest.xml"], arg_files: ["core/res/AndroidManifest.xml"],
args: metalava_framework_docs_args + module_libs, args: metalava_framework_docs_args + priv_apps + module_libs,
check_api: { check_api: {
current: { current: {
api_file: "non-updatable-api/module-lib-current.txt", api_file: "non-updatable-api/module-lib-current.txt",
@@ -293,17 +288,6 @@ droidstubs {
}, },
} }
// The following droidstub module generates source files for the API stub library for
// modules. Note that it not only includes its own APIs but also other APIs that have
// narrower scope (all @SystemApis, not just the ones with 'client=MODULE_LIBRARIES').
droidstubs {
name: "module-lib-api-stubs-docs",
defaults: ["metalava-non-updatable-api-stubs-default"],
arg_files: ["core/res/AndroidManifest.xml"],
args: metalava_framework_docs_args + priv_apps + module_libs,
}
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// android_*_stubs_current modules are the stubs libraries compiled // android_*_stubs_current modules are the stubs libraries compiled
// from *-api-stubs-docs // from *-api-stubs-docs
@@ -396,7 +380,7 @@ java_library_static {
java_library_static { 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-non-updatable" ],
defaults: ["android_defaults_stubs_current"], defaults: ["android_defaults_stubs_current"],
libs: ["sdk_system_29_android"], libs: ["sdk_system_29_android"],
} }