summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-02-07 18:41:27 -0800
committerStephen Hines <srhines@google.com>2013-02-08 19:07:15 -0800
commit52fa64616788bda77578bb82effc245c2c57747a (patch)
tree06e6a6cdc6591f58c31eeb41f9cd7b4c23a9433f /Android.mk
parentcef6ad5d4a60a6e2960f7f72de624d5e60b3908a (diff)
downloadandroid_packages_apps_Gallery2-52fa64616788bda77578bb82effc245c2c57747a.zip
android_packages_apps_Gallery2-52fa64616788bda77578bb82effc245c2c57747a.tar.gz
android_packages_apps_Gallery2-52fa64616788bda77578bb82effc245c2c57747a.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