summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-02-08 02:41:27 (GMT)
committerStephen Hines <srhines@google.com>2013-02-09 03:07:15 (GMT)
commitaa2d2b806cb4cc7a95eb412f2ac69268b893951c (patch)
treec2da6205cdc5d5f1c7f61d2b121a2e0695130c06 /Android.mk
parentb9cfda108ee0c562fc968bc782ffd04cd31ce320 (diff)
downloadandroid_packages_apps_Snap-aa2d2b806cb4cc7a95eb412f2ac69268b893951c.zip
android_packages_apps_Snap-aa2d2b806cb4cc7a95eb412f2ac69268b893951c.tar.gz
android_packages_apps_Snap-aa2d2b806cb4cc7a95eb412f2ac69268b893951c.tar.bz2
Switch to GalleryGoogle as default provider for RS files (from Gallery2).
Bug: 8138884 Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 7789619..f4a09e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,13 @@ LOCAL_RENDERSCRIPT_TARGET_API := 18
LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
+# 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_pd)
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res