X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=7c4ada1c2bd42cf0c7a9384332f004c1c26e5c11;hb=79b9b8d712d152c5b776fcb0ab542929fb6633c8;hp=14274224ba5271621d4ddaab4eea84cfa4f1f5fa;hpb=a86c0f3f2903c28cfa386aff5f32b43350381b2d;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/Android.mk b/Android.mk
index 14274224b..7c4ada1c2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@ -14,10 +16,16 @@ LOCAL_SRC_FILES := \
     $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
+    $(LOCAL_PATH)/../../../frameworks/support/compat/res \
+    $(LOCAL_PATH)/../../../frameworks/support/media-compat/res \
+    $(LOCAL_PATH)/../../../frameworks/support/core-ui/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_AAPT_FLAGS += \
+    --extra-packages android.support.compat \
+    --extra-packages android.support.mediacompat \
+    --extra-packages android.support.coreui \
 
 LOCAL_PACKAGE_NAME := Gallery2