commit de401bc144060b26574f78357ec217fd491a12d1
author Mathew Inwood <mathewi@google.com> Fri Jan 10 10:24:31 2020 +0000
committer Mathew Inwood <mathewi@google.com> Mon Jan 13 11:37:00 2020 +0000
tree 7d0892d733bfbfc4bc057985f59de0b79fdd51db
parent 8b1b697711ac22f4ceeb7ed781f95fdb5c7e1c8f

Include settings app compat config in the build.

This ensures that any compact changes defined in settings work correctly
at runtime.

Include the config in the system_ext partition rather than system to
avoid breaking rules about where we're allowed to put things.

Test: m
Test: Check compat changes appear in dev settings UI.
Change-Id: I4a6dc6bfcc5de1f68e97faf905ee94b35bde5d11

Android.bp

diff --git a/Android.bp b/Android.bp
index d21a430..e1c002d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@
 platform_compat_config {
     name: "settings-platform-compat-config",
     src: ":Settings-core",
+    system_ext_specific: true,
 }
 
 android_app {
@@ -62,7 +63,10 @@
     certificate: "platform",
     system_ext_specific: true,
     privileged: true,
-    required: ["privapp_whitelist_com.android.settings"],
+    required: [
+        "privapp_whitelist_com.android.settings",
+        "settings-platform-compat-config",
+    ],
     static_libs: ["Settings-core"],
     resource_dirs: [],
     optimize: {