diff options
| author | Ying Wang <wangying@android.com> | 2015-09-26 01:06:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-26 01:06:39 +0000 |
| commit | b97fb8178c538c45304f4d29ba16925ddfefe631 (patch) | |
| tree | 08d43f76c4e525d5bdf5a20dfd20874a31450040 /Android.mk | |
| parent | c42f3811ed137c424b088a83b064da5d179e0d13 (diff) | |
| parent | 76f4919d9506514f20b929ec475393e6312f38ec (diff) | |
| download | android_packages_apps_Gallery2-b97fb8178c538c45304f4d29ba16925ddfefe631.tar.gz android_packages_apps_Gallery2-b97fb8178c538c45304f4d29ba16925ddfefe631.tar.bz2 android_packages_apps_Gallery2-b97fb8178c538c45304f4d29ba16925ddfefe631.zip | |
am 76f4919d: Merge "Remove LOCAL_RENDERSCRIPT_SKIP_INSTALL"
* commit '76f4919d9506514f20b929ec475393e6312f38ec':
Remove LOCAL_RENDERSCRIPT_SKIP_INSTALL
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index 308851225..596b86eda 100644 --- a/Android.mk +++ b/Android.mk @@ -14,13 +14,9 @@ LOCAL_RENDERSCRIPT_TARGET_API := 18 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) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files) +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src) \ + $(call all-renderscript-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res |