summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAnand Chaudhari <anandc@codeaurora.org>2015-09-23 18:01:06 +0530
committerJack Yoo <jyoo@codeaurora.org>2015-09-30 10:54:49 -0700
commit922a2fa5c68bc6d301e96eca68cccbe9c10331b0 (patch)
treecc22b95989369c15e73c6ca20aad608162a6e536 /Android.mk
parent276a28999702d4dc9162c3109e3836f6d8e153b7 (diff)
downloadandroid_packages_apps_Gallery2-922a2fa5c68bc6d301e96eca68cccbe9c10331b0.tar.gz
android_packages_apps_Gallery2-922a2fa5c68bc6d301e96eca68cccbe9c10331b0.tar.bz2
android_packages_apps_Gallery2-922a2fa5c68bc6d301e96eca68cccbe9c10331b0.zip
Gallery2: Upgrade works
Make it work on the new platform Change-Id: I2d019f21bcb6da4e26fb671f23c5e1cef574bcd5
Diffstat (limited to 'Android.mk')
-rw-r--r--[-rwxr-xr-x]Android.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 7bf05c487..e676a5aab 100755..100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,21 +10,27 @@ 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
+#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)
+# $(warning Anand Commend LOCAL_RENDERSCRIPT_SKIP_INSTALL is $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
+# $(warning Anand Commend LOCAL_RENDERSCRIPT_SKIP_INSTALL is $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))
+
+LOCAL_PROGUARD_ENABLED := disabled
+
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_AAPT_FLAGS := --auto-add-overlay