diff options
| author | Artur Satayev <satayev@google.com> | 2020-03-25 16:45:56 +0000 |
|---|---|---|
| committer | Artur Satayev <satayev@google.com> | 2020-03-30 17:25:17 +0100 |
| commit | 0a97d5eaf2f57ed9d93c8360a8a83e98440a4ec7 (patch) | |
| tree | 9dbf0f6795966fc5819a0bb0774caf6ef6ac84a7 | |
| parent | d03b443e0fc626167a5b35aaaef7134ef0bacb0d (diff) | |
Remove hiddenapi-mappings and hiddenapi-list-docs.
We still need to keep access to removed APIs to keep them on greylist. Instead of having a separate run to generate those, we would instead depend on the actual droidstubs.
Kudos to Makoto for producing build traces:
"m droid"
Before: https://screenshot.googleplex.com/oEcd4x76YAz
After: https://screenshot.googleplex.com/CxZCNJMDyK5
"m sync"
Before: https://screenshot.googleplex.com/7cjE96qcNAL
After: https://screenshot.googleplex.com/po6BhCoP9L3
Bug: 143864733
Test: diff out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: If9dcac94eb077c6265c5acf5b3ce6d262db64f90
| -rw-r--r-- | StubLibraries.bp | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index f0810713f39f..de6d6f69f79f 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -89,6 +89,7 @@ droidstubs { api_filename: "public_api.txt", private_api_filename: "private.txt", removed_api_filename: "removed.txt", + removed_dex_api_filename: "removed-dex.txt", arg_files: [ "core/res/AndroidManifest.xml", ], @@ -129,6 +130,7 @@ droidstubs { api_filename: "system-api.txt", private_api_filename: "system-private.txt", removed_api_filename: "system-removed.txt", + removed_dex_api_filename: "system-removed-dex.txt", arg_files: [ "core/res/AndroidManifest.xml", ], @@ -315,42 +317,6 @@ java_library_static { } ///////////////////////////////////////////////////////////////////// -// Stubs for hiddenapi processing. -///////////////////////////////////////////////////////////////////// - -droidstubs { - name: "hiddenapi-lists-docs", - defaults: ["metalava-full-api-stubs-default"], - arg_files: [ - "core/res/AndroidManifest.xml", - ], - removed_dex_api_filename: "removed-dex.txt", - args: metalava_framework_docs_args + - " --show-unannotated " + - priv_apps + - " --show-annotation android.annotation.TestApi ", -} - -droidstubs { - name: "hiddenapi-mappings", - defaults: ["metalava-full-api-stubs-default"], - srcs: [ - ":opt-telephony-common-srcs", - ], - - arg_files: [ - "core/res/AndroidManifest.xml", - ], - dex_mapping_filename: "dex-mapping.txt", - args: metalava_framework_docs_args + - " --hide ReferencesHidden " + - " --hide UnhiddenSystemApi " + - " --show-unannotated " + - priv_apps + - " --show-annotation android.annotation.TestApi ", -} - -///////////////////////////////////////////////////////////////////// // api/*-current.txt files for use by modules in other directories // like the CTS test ///////////////////////////////////////////////////////////////////// |