diff options
| author | Anton Hansson <hansson@google.com> | 2020-04-23 09:52:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-23 09:52:00 +0000 |
| commit | f28c32e17d81de6af2294b8f3f291b547f1fc793 (patch) | |
| tree | 7af767e950f157cdcdc23643325ef13bfbe6cf21 | |
| parent | 29fdde65bcfd9ad64300fbfec397e851bfd649d7 (diff) | |
| parent | 19f58926e372c022e38b87ac9bffdf994d2321b3 (diff) | |
Merge "Remove obsolete droidstub args" into rvc-dev am: 19f58926e3
Change-Id: I28ad01b85a1f88a8b259b51463dee6dd00fdd896
| -rw-r--r-- | StubLibraries.bp | 11 | ||||
| -rw-r--r-- | cmds/uiautomator/library/Android.bp | 3 | ||||
| -rw-r--r-- | services/Android.bp | 1 |
3 files changed, 0 insertions, 15 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 111828f0b590..e1f1ad9b5945 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -98,9 +98,6 @@ stubs_defaults { droidstubs { name: "api-stubs-docs", defaults: ["metalava-full-api-stubs-default"], - 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", @@ -143,10 +140,6 @@ module_libs = " " + droidstubs { name: "system-api-stubs-docs", defaults: ["metalava-full-api-stubs-default"], - api_tag_name: "SYSTEM", - 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", @@ -179,9 +172,6 @@ droidstubs { droidstubs { name: "test-api-stubs-docs", defaults: ["metalava-full-api-stubs-default"], - api_tag_name: "TEST", - api_filename: "test-api.txt", - removed_api_filename: "test-removed.txt", arg_files: [ "core/res/AndroidManifest.xml", ], @@ -217,7 +207,6 @@ droidstubs { droidstubs { name: "module-lib-api", defaults: ["metalava-full-api-stubs-default"], - api_tag_name: "MODULE_LIB", arg_files: ["core/res/AndroidManifest.xml"], args: metalava_framework_docs_args + module_libs, diff --git a/cmds/uiautomator/library/Android.bp b/cmds/uiautomator/library/Android.bp index 3a260639de0f..c33d31f576a3 100644 --- a/cmds/uiautomator/library/Android.bp +++ b/cmds/uiautomator/library/Android.bp @@ -28,9 +28,6 @@ droiddoc { installable: false, args: "-stubpackages com.android.uiautomator.core:" + "com.android.uiautomator.testrunner", - api_tag_name: "UIAUTOMATOR", - api_filename: "uiautomator_api.txt", - removed_api_filename: "uiautomator_removed_api.txt", check_api: { current: { diff --git a/services/Android.bp b/services/Android.bp index 730b9a5dc3e3..6d637bedeef7 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -112,7 +112,6 @@ droidstubs { name: "services-stubs.sources", srcs: [":services-all-sources"], installable: false, - api_tag_name: "SYSTEM_SERVER", args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" + " --hide-annotation android.annotation.Hide" + " --hide InternalClasses" + // com.android.* classes are okay in this interface |