From 7e7fdde3a52c50aeaa118b7421039639424c55a2 Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Wed, 25 Mar 2020 16:45:56 +0000
Subject: [PATCH] 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
Exempt-From-Owner-Approval: clean cherry-pick

(cherry picked from commit 0a97d5eaf2f57ed9d93c8360a8a83e98440a4ec7)

Change-Id: If9dcac94eb077c6265c5acf5b3ce6d262db64f90
Merged-In: If9dcac94eb077c6265c5acf5b3ce6d262db64f90
---
 StubLibraries.bp | 40 ++--------------------------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index ccd873352a332..60f6174740df1 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -95,6 +95,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",
     ],
@@ -141,6 +142,7 @@ droidstubs {
     private_api_filename: "system-private.txt",
     private_dex_api_filename: "system-private-dex.txt",
     removed_api_filename: "system-removed.txt",
+    removed_dex_api_filename: "system-removed-dex.txt",
     arg_files: [
         "core/res/AndroidManifest.xml",
     ],
@@ -339,44 +341,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",
-    ],
-    dex_api_filename: "public-dex.txt",
-    private_dex_api_filename: "private-dex.txt",
-    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