From aa2d2b806cb4cc7a95eb412f2ac69268b893951c Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 7 Feb 2013 18:41:27 -0800
Subject: Switch to GalleryGoogle as default provider for RS files (from
 Gallery2).

Bug: 8138884
Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
---
 Android.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 7789619f3..f4a09e835 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
-- 
cgit v1.2.3