From aec9bc16bf4e810be983862a36f07ea7dfa8bc36 Mon Sep 17 00:00:00 2001
From: atrost <atrost@google.com>
Date: Fri, 16 Aug 2019 18:14:09 +0100
Subject: [PATCH] Move required back to frameworks target.

Being attached to framework-minus-aosp the config files don't get
uploaded to device, and this fixes it.

Bug: 138222363
Test: m + flashed device, configs are now present.
Change-Id: Id15f1b3dceace0dafd438bd92ad165932a597318
---
 Android.bp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index b80ef889d1a8f..b597432239ff3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -241,10 +241,6 @@ java_library {
     name: "framework-minus-apex",
     defaults: ["framework-defaults"],
     javac_shard_size: 150,
-    required: [
-        "framework-platform-compat-config",
-        "libcore-platform-compat-config",
-    ],
 }
 
 java_library {
@@ -255,6 +251,10 @@ java_library {
         "framework-minus-apex",
         "jobscheduler-framework",
     ],
+    required: [
+        "framework-platform-compat-config",
+        "libcore-platform-compat-config",
+    ],
     sdk_version: "core_platform",
 }