Merge "Make unsupportedappusage_index.csv a build artifact."

1 files changed, 11 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 5d125f936d44..17e31e04506f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -757,6 +757,7 @@ java_library {
 java_library {
     name: "framework-annotation-proc",
     defaults: ["framework-defaults"],
+    installable: false,
     // Use UsedByApps annotation processor
     plugins: ["unsupportedappusage-annotation-processor"],
 }
@@ -1716,3 +1717,13 @@ aidl_mapping {
     srcs: [":framework-defaults"],
     output: "framework-aidl-mappings.txt",
 }
+
+genrule {
+    name: "framework-annotation-proc-index",
+    srcs: [":framework-annotation-proc"],
+    cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
+    out: ["unsupportedappusage_index.csv"],
+    dist: {
+        targets: ["droidcore"],
+    },
+}