summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-04-23 09:56:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-04-23 09:56:40 +0000
commit8b9e50c2b301ff5af98a7df651f5f718af0801c4 (patch)
treee276431319c2c54c1ef0f518184fc34bf5b39f72
parent428a8479813325ba82a6ad3d5462a655f094143d (diff)
parent0fa5427c3b2e3677b876cca67bf66ecb1acb8676 (diff)
Merge "Remove obsolete droidstub args"
-rw-r--r--StubLibraries.bp11
-rw-r--r--cmds/uiautomator/library/Android.bp3
-rw-r--r--services/Android.bp1
3 files changed, 0 insertions, 15 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 20c8a83ff83e..74b0524f4fd2 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -86,9 +86,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",
@@ -131,10 +128,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",
@@ -167,9 +160,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",
],
@@ -205,7 +195,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 ab6fb7ff95d2..b4d8393683ba 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -106,7 +106,6 @@ droidstubs {
name: "services-stubs.sources",
srcs: [":services-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