diff options
| author | Stephen Hines <srhines@google.com> | 2013-02-12 01:25:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-12 01:25:31 +0000 |
| commit | 46dcad6e7c0178f58696feb25cdbfc4ce4cbf235 (patch) | |
| tree | 1afd7cd436364a5c797c0aa89a8a4bb75a2b680f | |
| parent | 32ee1acbd9f9ab0db382f0947a1ca1f3dfe52059 (diff) | |
| parent | 52fa64616788bda77578bb82effc245c2c57747a (diff) | |
| download | android_packages_apps_Gallery2-46dcad6e7c0178f58696feb25cdbfc4ce4cbf235.tar.gz android_packages_apps_Gallery2-46dcad6e7c0178f58696feb25cdbfc4ce4cbf235.tar.bz2 android_packages_apps_Gallery2-46dcad6e7c0178f58696feb25cdbfc4ce4cbf235.zip | |
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 7 insertions, 1 deletions
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 |