X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=7c4ada1c2bd42cf0c7a9384332f004c1c26e5c11;hb=16e12418378554bae35fbb1d60eda4639ba50d82;hp=670cc4cc919f80c5e7aa9dceb45450d5c3be0a21;hpb=59aa477aa02ce30a6c7632099b4b6337485c807a;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/Android.mk b/Android.mk
index 670cc4cc9..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,9 +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_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 \
+    --extra-packages android.support.mediacompat \
+    --extra-packages android.support.coreui \
 
 LOCAL_PACKAGE_NAME := Gallery2