diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-07-16 16:37:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 16:37:48 +0000 |
| commit | 2f20e9afe7d35c065067f9bf21ad49dc9642d974 (patch) | |
| tree | 35c9ddee9b7130ab6adfa7fd68f0c8666232c747 | |
| parent | a93a01f9ebb610fd5074ae577877d99e34b0178e (diff) | |
| parent | def1e68ead14f1869d4037e7cd754ec0fb6732fb (diff) | |
Merge "Merge module-lib-api-stubs-docs and -non-updatable" am: def1e68ead
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363799
Change-Id: Ib2e7f6b0575ee13fc1c341f1fb566e60920a621e
| -rw-r--r-- | StubLibraries.bp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index b984cb0d0714..26478d3bad26 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -229,11 +229,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"], @@ -270,7 +265,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", @@ -279,17 +274,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 @@ -335,7 +319,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"], } |