From 0fa5427c3b2e3677b876cca67bf66ecb1acb8676 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 22 Apr 2020 14:21:54 +0100
Subject: [PATCH] Remove obsolete droidstub args

- I see no usages of private_api_filename / private.txt /
  private_dex_api_filename
- tags are no longer used as of
  Iff355041d88eb59ac47dd19a03e993cf1ce3927e
- api_filename/removed_api_filename does nothing if check_api is
  specified. test-api does not need a removed.txt

Bug: 152479829
Bug: 144149403
Test: m
Change-Id: Ic1e859dc6aa91f8d7b4f285b63d3faafb27edc9b
Merged-In: Ic1e859dc6aa91f8d7b4f285b63d3faafb27edc9b
(cherry picked from commit 960c16cd389fd56542fd3dcc8935406e022cb1be)
---
 StubLibraries.bp                    | 11 -----------
 cmds/uiautomator/library/Android.bp |  3 ---
 services/Android.bp                 |  1 -
 3 files changed, 15 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 304f231cb3afe..ccfd0d1674a0e 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",
@@ -126,10 +123,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",
@@ -157,9 +150,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",
     ],
@@ -190,7 +180,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 3a260639de0f1..c33d31f576a37 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 8af642cafffdb..d0d6d205bf8a6 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