diff options
| author | Stephen Hines <srhines@google.com> | 2013-01-23 18:38:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-23 18:38:42 +0000 |
| commit | dbbdb5c63405771a76c168ef569b7a789b3b9d73 (patch) | |
| tree | a2368e6863f823b859c955299cde1ac8240c805b | |
| parent | 981d661739acfef1b55558a4b8631a144881b8d5 (diff) | |
| download | android_packages_apps_Snap-dbbdb5c63405771a76c168ef569b7a789b3b9d73.tar.gz android_packages_apps_Snap-dbbdb5c63405771a76c168ef569b7a789b3b9d73.tar.bz2 android_packages_apps_Snap-dbbdb5c63405771a76c168ef569b7a789b3b9d73.zip | |
Revert "Switch Gallery over to RS compatibility library."
This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c
Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 1ef2fab10..a5efe5500 100644 --- a/Android.mk +++ b/Android.mk @@ -8,17 +8,12 @@ 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 \ @@ -34,9 +29,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 librsjni + LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters else - LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni + LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters endif LOCAL_PROGUARD_FLAG_FILES := proguard.flags |