From e19ebc502e0eaf754fb58d8190f88dd8db2086fa Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 15 Jul 2020 10:38:04 -0700 Subject: [PATCH] Merge module-lib-api-stubs-docs and -non-updatable Test: build / treehugger Bug: 146727827 Change-Id: I9e8038b3899270ada12ed4cc057aeace2a36902d Merged-in: I9e8038b3899270ada12ed4cc057aeace2a36902d --- StubLibraries.bp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/StubLibraries.bp b/StubLibraries.bp index 11d3f2d64e926..9f1280c2ddf49 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -238,11 +238,6 @@ droidstubs { // 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 { name: "module-lib-api", defaults: ["metalava-full-api-stubs-default"], @@ -275,7 +270,7 @@ droidstubs { name: "module-lib-api-stubs-docs-non-updatable", defaults: ["metalava-non-updatable-api-stubs-default"], arg_files: ["core/res/AndroidManifest.xml"], - args: metalava_framework_docs_args + module_libs, + args: metalava_framework_docs_args + priv_apps + module_libs, check_api: { current: { api_file: "non-updatable-api/module-lib-current.txt", @@ -288,17 +283,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 // from *-api-stubs-docs @@ -388,7 +372,7 @@ java_library_static { java_library_static { 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"], libs: ["sdk_system_29_android"], }