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

2019-08-08 10:54:02 +00:00
parent 13b0b1a73d b9c3450355
commit d7345e923a
1 changed files with 14 additions and 2 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -752,14 +752,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.