summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2014-12-15 16:52:42 -0800
committerSteve Kondik <steve@cyngn.com>2015-03-28 14:56:24 -0700
commit650712e4615d4bbc25b07c11babfe824d7fb6f64 (patch)
tree9a78782901999cab9c41d51378a4fdab32a90c74 /Android.mk
parent2deb6f518822055f4b60bbe8afabc938a9023cc9 (diff)
downloadandroid_packages_apps_Gallery2-650712e4615d4bbc25b07c11babfe824d7fb6f64.zip
android_packages_apps_Gallery2-650712e4615d4bbc25b07c11babfe824d7fb6f64.tar.gz
android_packages_apps_Gallery2-650712e4615d4bbc25b07c11babfe824d7fb6f64.tar.bz2
Gallery2: Fix filtershow renderscript for lollipop
* Use the non support version Change-Id: Idce8f3f4741def8dcd080f226cd9a0ef909f7eb1
Diffstat (limited to 'Android.mk')
-rwxr-xr-xAndroid.mk13
1 files changed, 1 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index 0b471b6..8721c36 100755
--- a/Android.mk
+++ b/Android.mk
@@ -10,19 +10,8 @@ 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_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