commit f727d52be15f6eae36b3f71fad039c190d6bc317
author Priyank Singh <priyanksingh@google.com> Fri May 24 07:06:22 2019 -0700
committer Priyank Singh <priyanksingh@google.com> Fri May 24 07:06:22 2019 -0700
tree a7fb8088842299bcbb3c20ea3d4bb7a0056e7228
parent 1d648b2175d053c7dd9a3b47c59393a6a7506c5b

Allow static overlays of the car/libs used by Settings.

Bug: 130448846
Test: Manual
Change-Id: I598403bd016144cf1d7f4da988cf1e05657dee5b

Android.mk

diff --git a/Android.mk b/Android.mk
index 7ed8cb3..fc94a59 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,8 +44,12 @@
       car-setup-wizard-lib-utils \
       SettingsLib
 
-  LOCAL_RESOURCE_DIR := \
-      $(LOCAL_PATH)/res
+  # Including the resources for the static android libraries allows this app to pick up their static overlays.
+  LOCAL_RESOURCE_DIR += \
+      $(LOCAL_PATH)/res \
+      $(LOCAL_PATH)/../libs/car-apps-common/res \
+      $(LOCAL_PATH)/../libs/car-settings-lib/res \
+      $(LOCAL_PATH)/../../../../frameworks/base/packages/SettingsLib/res
 
   LOCAL_CERTIFICATE := platform
 
@@ -101,8 +105,11 @@
       SettingsLib
 
   LOCAL_RESOURCE_DIR := \
+      $(LOCAL_PATH)/res \
       $(LOCAL_PATH)/tests/robotests/res \
-      $(LOCAL_PATH)/res
+      $(LOCAL_PATH)/../libs/car-apps-common/res \
+      $(LOCAL_PATH)/../libs/car-settings-lib/res \
+      $(LOCAL_PATH)/../../../../frameworks/base/packages/SettingsLib/res
 
   LOCAL_CERTIFICATE := platform