X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=7c4ada1c2bd42cf0c7a9384332f004c1c26e5c11;hb=5957588dbb2c76b8112bc05a04cf68e7a4c530f7;hp=3088512253b4c966111a99a6ad05248a1bdf589f;hpb=5f178d0027b943f911a33dbb74911e3890c3c3e8;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/Android.mk b/Android.mk
index 308851225..7c4ada1c2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,28 +4,28 @@ 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
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
 
-LOCAL_RENDERSCRIPT_TARGET_API := 18
-LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
-
-# Keep track of previously compiled RS files too (from bundled GalleryGoogle).
-prev_compiled_rs_files := $(call all-renderscript-files-under, src)
-
-# We already have these files from GalleryGoogle, so don't install them.
-LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(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
 
@@ -33,7 +33,7 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
+LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags