X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=e936e27126dc03f3e234e32815ae5c2d3ca764fd;hb=083e7f906abf00a9b6819c6995eb8164a58b2171;hp=de7e0d9e955f3d54b0a3979fcb3537b5c611465a;hpb=32e9492d3d5d0fae297af88865cfc3cfc22e27c1;p=android-x86%2Fpackages-apps-Eleven.git

diff --git a/Android.mk b/Android.mk
index de7e0d9..e936e27 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,28 +3,43 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := src/com/cyngn/eleven/IElevenService.aidl
+LOCAL_SRC_FILES := src/com/cyanogenmod/eleven/IElevenService.aidl
 LOCAL_SRC_FILES += $(call all-java-files-under, src)
 
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res) \
+    $(TOP)/frameworks/support/v7/cardview/res \
+    $(TOP)/frameworks/support/v7/recyclerview/res
+
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
     android-support-v8-renderscript \
+    android-support-v7-palette \
+    android-support-v7-cardview \
     android-common \
-    nineoldandroids \
-    palette
+    android-support-v4 \
+    android-support-v7-recyclerview \
+    guava
+
+LOCAL_AAPT_FLAGS := \
+    --auto-add-overlay \
+    --extra-packages android.support.v7.cardview \
+    --extra-packages android.support.v7.recyclerview
 
 LOCAL_PACKAGE_NAME := Eleven
 LOCAL_OVERRIDES_PACKAGES := Music
 
-LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_PRIVILEGED_MODULE := true
 
-include $(BUILD_PACKAGE)
+LOCAL_JNI_SHARED_LIBRARIES := librsjni
+
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.cfg
+ifeq ($(TARGET_BUILD_VARIANT),user)
+    LOCAL_PROGUARD_ENABLED := obfuscation
+else
+    LOCAL_PROGUARD_ENABLED := disabled
+endif
 
-#Include nineoldadroids/palette jar
+include $(BUILD_PACKAGE)
 
 include $(CLEAR_VARS)
 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    nineoldandroids:libs/nineoldandroids-2.4.0.jar \
-    palette:libs/android-support-v7-palette.jar
 include $(BUILD_MULTI_PREBUILT)