DO NOT MERGE Allow static overlays of the car/libs used by Settings.
Bug: 130448846
Test: Manual
Change-Id: I598403bd016144cf1d7f4da988cf1e05657dee5b
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