commit 58bada3bde5657e5a452296cb5d1ac336ff35929
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 25 03:03:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 25 03:03:26 2019 +0000
tree 6401d07f34f755ebdb941fd6db9dca345bdb8ff2
parent 5ab2d8490dc18b9b4a1d949db1f8e0f960a0fddd
parent 240b0939498090116a5145e4dfc8d2bc5dfda8af

Merge "DO NOT MERGE Allow static overlays of the car/libs used by Settings." into pi-car-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index a9c6acf..ea31d6c 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
 
@@ -100,7 +104,10 @@
 
   LOCAL_RESOURCE_DIR := \
       $(LOCAL_PATH)/res \
-      $(LOCAL_PATH)/tests/robotests/res
+      $(LOCAL_PATH)/tests/robotests/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