commit 8e7971fe72fdb1be1344c5098ad5de4505551195
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 13 12:12:56 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 12:12:56 2019 +0000
tree 62a1338edb72c97d0136cfdceb1e3e49e70dd409
parent 5ab1017716a179290d99e430b20555a138c2537d
parent 0b5eb9a48687d91144399f029cf136d0617a7b74

Merge "Replace framework-annotation-proc java lib with framework-all"

Android.bp

diff --git a/Android.bp b/Android.bp
index 4485682..2485bd7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -463,13 +463,6 @@
     defaults: ["framework-defaults"],
     srcs: [":framework-all-sources"],
     installable: false,
-}
-
-java_library {
-    name: "framework-annotation-proc",
-    defaults: ["framework-aidl-export-defaults"],
-    srcs: [":framework-all-sources"],
-    installable: false,
     plugins: [
         "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
@@ -478,7 +471,7 @@
 
 platform_compat_config {
     name: "framework-platform-compat-config",
-    src: ":framework-annotation-proc",
+    src: ":framework-all",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
@@ -1617,7 +1610,7 @@
 
 genrule {
     name: "framework-annotation-proc-index",
-    srcs: [":framework-annotation-proc"],
+    srcs: [":framework-all"],
     cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
     out: ["unsupportedappusage_index.csv"],
     dist: {