summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-02-04 13:09:27 -0800
committerTim Murray <timmurray@google.com>2013-02-04 13:09:27 -0800
commita64051696e46fb5d5e1c76e53ac95a4feba18585 (patch)
tree04663cea1049aaf27976abcd64f116c70ae313eb /Android.mk
parent87e889b195de98334048bb70bb1263a2ab76c76a (diff)
downloadandroid_packages_apps_Gallery2-a64051696e46fb5d5e1c76e53ac95a4feba18585.zip
android_packages_apps_Gallery2-a64051696e46fb5d5e1c76e53ac95a4feba18585.tar.gz
android_packages_apps_Gallery2-a64051696e46fb5d5e1c76e53ac95a4feba18585.tar.bz2
Switch Gallery over to RS compatibility library.
Change-Id: If27809236534f3b196949bf455faed45c99f3da5
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 8b13183..7789619 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
+LOCAL_STATIC_JAVA_LIBRARIES += android.support.v8.renderscript
+
+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)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
@@ -27,9 +32,9 @@ LOCAL_SDK_VERSION := current
# the libraries in the APK, otherwise just put them in /system/lib and
# leave them out of the APK
ifneq (,$(TARGET_BUILD_APPS))
- LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+ LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
else
- LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+ LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
endif
LOCAL_PROGUARD_FLAG_FILES := proguard.flags