diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rwxr-xr-x | jni/Android.mk | 2 | ||||
| -rw-r--r-- | src/com/android/camera/imageprocessor/FrameProcessor.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index cb4d3562c..3d6711391 100644 --- a/Android.mk +++ b/Android.mk @@ -39,9 +39,9 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags # 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_snapmosaic libjni_snaptinyplanet libjni_imageutil + LOCAL_JNI_SHARED_LIBRARIES := libjni_snapmosaic libjni_snaptinyplanet libjni_snapimageutil else - LOCAL_REQUIRED_MODULES := libjni_snapmosaic libjni_snaptinyplanet libjni_imageutil + LOCAL_REQUIRED_MODULES := libjni_snapmosaic libjni_snaptinyplanet libjni_snapimageutil endif include $(BUILD_PACKAGE) diff --git a/jni/Android.mk b/jni/Android.mk index 964bd9b01..436ad2b10 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -67,7 +67,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDFLAGS := -llog LOCAL_SDK_VERSION := 9 -LOCAL_MODULE := libjni_imageutil +LOCAL_MODULE := libjni_snapimageutil LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := image_util_jni.cpp LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops diff --git a/src/com/android/camera/imageprocessor/FrameProcessor.java b/src/com/android/camera/imageprocessor/FrameProcessor.java index 6a2091158..3e1d6085d 100644 --- a/src/com/android/camera/imageprocessor/FrameProcessor.java +++ b/src/com/android/camera/imageprocessor/FrameProcessor.java @@ -333,7 +333,7 @@ public class FrameProcessor { private native int nativeNV21toRgb(ByteBuffer yvuBuf, ByteBuffer rgbBuf, int width, int height); static { - System.loadLibrary("jni_imageutil"); + System.loadLibrary("jni_snapimageutil"); } } |