diff options
| author | 2018-03-12 16:23:29 +0000 | |
|---|---|---|
| committer | 2018-03-12 16:23:29 +0000 | |
| commit | c82bcf4d3c60c5b3a11bdedc08ea50686b0cd357 (patch) | |
| tree | 3661193317874276b494840b9d222b34b95c9ca6 | |
| parent | 9554dd94ecbf159f22372e6d046b362a97b3e527 (diff) | |
| parent | 8f919514d51c769bec78210effcfd11fee1f798d (diff) | |
Merge "Fix resource directory references" into pi-dev
| -rw-r--r-- | packages/SettingsLib/common.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 3f9a0fd41c04..15b50d719291 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -34,21 +34,21 @@ LOCAL_RESOURCE_DIR += $(call my-dir)/res # Include support-v7-appcompat, if not already included ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res +LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat endif # Include support-v7-recyclerview, if not already included ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res +LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview endif # Include android-support-v7-preference, if not already included ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/preference/res +LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/preference/res LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference endif |