Merge "Upload platform compat config generated from framework target."

am: d7345e923a

Change-Id: I41a4313e96c68bb8efa644816c7d8278c988265b

1 files changed, 14 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index e98e1a5dceb2..8e3ae83a1aa9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -832,14 +832,26 @@ java_library {
     name: "framework",
     defaults: ["framework-defaults"],
     javac_shard_size: 150,
+    required: [
+        "framework-platform-compat-config",
+        "libcore-platform-compat-config",
+    ],
 }
 
 java_library {
     name: "framework-annotation-proc",
     defaults: ["framework-defaults"],
     installable: false,
-    // Use UsedByApps annotation processor
-    plugins: ["unsupportedappusage-annotation-processor"],
+    plugins: [
+        "unsupportedappusage-annotation-processor",
+        "compat-changeid-annotation-processor",
+    ],
+}
+
+platform_compat_config {
+    name: "framework-platform-compat-config",
+    prefix: "framework",
+    src: ":framework-annotation-proc",
 }
 
 // A library including just UnsupportedAppUsage.java classes.