Merge "Remove --ignore-classes-on-classpath argument" am: c02168f5d1 am: 481ba3e20a am: 8bf15714d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697265

Change-Id: I15a0a33b96f8a57ba7146166c458e92d397862fb
diff --git a/ApiDocs.bp b/ApiDocs.bp
index c1dc00b..3862795 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -108,9 +108,7 @@
     arg_files: [
         "core/res/AndroidManifest.xml",
     ],
-    args: metalava_framework_docs_args +
-        // Needed for hidden libcore annotations for now.
-        " --ignore-classes-on-classpath ",
+    args: metalava_framework_docs_args,
     write_sdk_values: true,
 }
 
@@ -121,8 +119,6 @@
         "core/res/AndroidManifest.xml",
     ],
     args: metalava_framework_docs_args +
-        // Needed for hidden libcore annotations for now.
-        " --ignore-classes-on-classpath " +
         " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ",
     write_sdk_values: true,
 }