summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-03-02 01:15:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-02 01:15:15 +0000
commit804c4f6f084aebcc4041e13601b818be2e7eb51d (patch)
tree5a033026e6960424c4db398a532ddd9030a51f98
parent97002b2c0e2b2de5e0b3c323d7b3c1a5d4bc9a6d (diff)
parent5982303f2ba1175d7f255add5deadf732d849d4f (diff)
Merge "Merge "Revert "Revert "Enable static overlay for SettingsLib resources""" am: 4fd23b08e3 am: cabf640bb4 am: 6382f9411f"
-rw-r--r--packages/SettingsLib/common.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk
index 8c309ff97370..8d24eaba5cc4 100644
--- a/packages/SettingsLib/common.mk
+++ b/packages/SettingsLib/common.mk
@@ -31,3 +31,4 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \
androidx.legacy_legacy-preference-v14 \
SettingsLib
+LOCAL_RESOURCE_DIR += $(call my-dir)/res