Merge "Revert "Replace framework-annotation-proc java lib with framework-all"" am: 546f68a66f

am: 06fa6a7e21

Change-Id: Ia369e201d6e33c305090f36ff89f54242af82ee9

Android.bp

@@ -456,6 +456,14 @@ java_library {
     srcs: [":framework-all-sources"],
     installable: false,
     libs: ["app-compat-annotations"],
+}
+
+java_library {
+    name: "framework-annotation-proc",
+    defaults: ["framework-defaults"],
+    srcs: [":framework-all-sources"],
+    libs: ["app-compat-annotations"],
+    installable: false,
     plugins: [
         "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
@@ -464,7 +472,7 @@ java_library {
 
 platform_compat_config {
     name: "framework-platform-compat-config",
-    src: ":framework-all",
+    src: ":framework-annotation-proc",
 }
 
 // A library including just UnsupportedAppUsage.java classes.
@@ -1556,7 +1564,7 @@ aidl_mapping {
 
 genrule {
     name: "framework-annotation-proc-index",
-    srcs: [":framework-all"],
+    srcs: [":framework-annotation-proc"],
     cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
     out: ["unsupportedappusage_index.csv"],
     dist: {