commit 7ff866d286cf4df0948feeffa6e67848740e64eb
author Sudheer Shanka <sudheersai@google.com> Tue Jan 12 17:22:06 2016 +0000
committer Sudheer Shanka <sudheersai@google.com> Tue Jan 12 18:14:24 2016 +0000
tree 36d1bd08291685255f9704d04d067ae5748d40b5
parent 0ec431247587cfd98b1f8963fdc3c1c469ae3114

Move restricted padlock support to SettingsLib

Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4

packages/SettingsLib/Android.mk

diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk
index c860668..2189b55 100644
--- a/packages/SettingsLib/Android.mk
+++ b/packages/SettingsLib/Android.mk
@@ -3,9 +3,22 @@
 
 LOCAL_MODULE := SettingsLib
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    android-support-v7-recyclerview \
+    android-support-v7-preference \
+    android-support-v7-appcompat \
+    android-support-v14-preference
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
+    frameworks/support/v7/preference/res \
+    frameworks/support/v14/preference/res \
+    frameworks/support/v7/appcompat/res \
+    frameworks/support/v7/recyclerview/res
+
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
+LOCAL_AAPT_FLAGS := --auto-add-overlay \
+    --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview
+
 include $(BUILD_STATIC_JAVA_LIBRARY)