Eleven: Synchronization on a non-final field 'mPauseLock'

[android-x86/packages-apps-Eleven.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index fc6510d..13ec0a0 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -3,23 +3,39 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := src/com/andrew/apollo/IApolloService.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-v8-renderscript \
+    android-support-v7-palette \
+    android-support-v7-cardview \
+    android-common \
     android-support-v4 \
-    jaudiotagger
+    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 := Apollo
+LOCAL_PACKAGE_NAME := Eleven
+LOCAL_OVERRIDES_PACKAGES := Music
 
-LOCAL_SDK_VERSION := current
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.cfg
+ifeq ($(TARGET_BUILD_VARIANT),user)
+    LOCAL_PROGUARD_ENABLED := obfuscation
+else
+    LOCAL_PROGUARD_ENABLED := disabled
+endif
 
 include $(BUILD_PACKAGE)
 
-##################################################
 include $(CLEAR_VARS)
 
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := jaudiotagger:libs/jaudiotagger.jar
-
 include $(BUILD_MULTI_PREBUILT)