X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=596b86edaa3bb1bdadba7d0021cdfea3469b1445;hb=643998123e7f96a9d05c038f649a8ce662765dcd;hp=5e461d82ba7705880a977870a8475ac106ff5203;hpb=99f4bfd5d1305192a95ec8b710c521ca38503ae7;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/Android.mk b/Android.mk
index 5e461d82b..596b86eda 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,19 +8,15 @@ LOCAL_STATIC_JAVA_LIBRARIES := 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_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
@@ -33,24 +29,17 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := current
 
-# If this is an unbundled build (to install seprately) then include
-# the libraries in the APK, otherwise just put them in /system/lib and
-# leave them out of the APK
-ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
-else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
-endif
+LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-include $(BUILD_PACKAGE)
+LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
 
-include $(call all-makefiles-under, jni)
+include $(BUILD_PACKAGE)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 
-# Use the following include to make gallery test apk and the mosaic library
+# Use the following include to make gallery test apk
 include $(call all-makefiles-under, $(LOCAL_PATH))
 
 endif