From de401bc144060b26574f78357ec217fd491a12d1 Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Fri, 10 Jan 2020 10:24:31 +0000
Subject: [PATCH] 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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index d21a4300b92..e1c002d93b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@ android_library {
 platform_compat_config {
     name: "settings-platform-compat-config",
     src: ":Settings-core",
+    system_ext_specific: true,
 }
 
 android_app {
@@ -62,7 +63,10 @@ android_app {
     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: {