From b9c345035583989d1667fbb52463428e5db32ee3 Mon Sep 17 00:00:00 2001
From: atrost <atrost@google.com>
Date: Mon, 5 Aug 2019 12:22:18 +0100
Subject: [PATCH] Upload platform compat config generated from framework
 target.

Add compat-changeid-annotation-processor and upload the generated compat
config using the platform_compat_config rule.
Make both libcore and framework compat configs required for framework to
make sure they get onto the device. Libcore will be removed once the
config is uploaded to APEX.

Test: flashed device locally, config files found and read by
com.android.server.compat.CompatConfig.
Bug: 138222363

Change-Id: Ie04fde8b4b18e7e34d95257f5ef8ca78d5076b4f
---
 Android.bp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index c8c4a15c2bea..c1949295a0d8 100644
--- 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.
-- 
2.11.0