From 5020703beb74b8d2c604e349adc67b13bd7f779f Mon Sep 17 00:00:00 2001
From: Adam Pardyl <apardyl@google.com>
Date: Mon, 9 Sep 2019 14:37:27 +0200
Subject: [PATCH] Fix a workaround for "required" property bug.

The build system does not propagate "required" properties correctly,
they need to be applied to the final installed java_library to work.

Bug:
Test: make

Change-Id: I7268a5bd56ee5be791782a0e584a9ada01538b98
---
 Android.bp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 121decbbec50..ee3cb8fad9e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -234,6 +234,11 @@ java_defaults {
             "wifi/java",
         ],
     },
+
+    required: [
+        // TODO: remove gps_debug when the build system propagates "required" properly.
+        "gps_debug.conf",
+    ],
 }
 
 // Collection of classes that are generated from non-Java files that are not listed in
@@ -307,11 +312,6 @@ java_defaults {
 
     static_libs: ["framework-internal-utils"],
 
-    required: [
-        // TODO: remove gps_debug when the build system propagates "required" properly.
-        "gps_debug.conf",
-    ],
-
     dxflags: [
         "--core-library",
         "--multi-dex",