summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-01-17 01:54:08 (GMT)
committerStephen Hines <srhines@google.com>2013-01-23 02:06:10 (GMT)
commit981d661739acfef1b55558a4b8631a144881b8d5 (patch)
tree3cbb95427e41394ecc6b745f9d24f6dc43d9eb89 /Android.mk
parent3b8066f77fba0673db8ecfc0916da27f09ee565d (diff)
downloadandroid_packages_apps_Snap-981d661739acfef1b55558a4b8631a144881b8d5.zip
android_packages_apps_Snap-981d661739acfef1b55558a4b8631a144881b8d5.tar.gz
android_packages_apps_Snap-981d661739acfef1b55558a4b8631a144881b8d5.tar.bz2
Switch Gallery over to RS compatibility library.
Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index a5efe55..1ef2fab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,12 +8,17 @@ 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)
LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_RESOURCE_DIR += packages/apps/Camera/res
LOCAL_AAPT_FLAGS := --auto-add-overlay \
@@ -29,9 +34,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