OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Include disabled managed profiles in Accounts page" into oc-dev
[android-x86/packages-apps-Settings.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
349b79c
..
eeaad0c
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-22,9
+22,10
@@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-v13 \
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-v13 \
- android-support-v7-recyclerview \
- android-support-v7-preference \
android-support-v7-appcompat \
android-support-v7-appcompat \
+ android-support-v7-cardview \
+ android-support-v7-preference \
+ android-support-v7-recyclerview \
android-support-v14-preference
LOCAL_JAVA_LIBRARIES := \
android-support-v14-preference
LOCAL_JAVA_LIBRARIES := \