summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-10-04 09:08:21 -0700
committerSteve Kondik <steve@cyngn.com>2016-10-04 09:08:21 -0700
commit95309463d1f17c6d5ba78d31817f70a45c9624ff (patch)
treec7b3d26e6e918e3088cb6a178fae6d8c58b5de7b
parent714fc7e212e6f1c68d0f09b71855c4362aea9ff2 (diff)
downloadandroid_packages_apps_Snap-95309463d1f17c6d5ba78d31817f70a45c9624ff.zip
android_packages_apps_Snap-95309463d1f17c6d5ba78d31817f70a45c9624ff.tar.gz
android_packages_apps_Snap-95309463d1f17c6d5ba78d31817f70a45c9624ff.tar.bz2
snap: Fix module name conflict
* Change jni_imageutil to jni_snapimageutil Change-Id: I61eef66a439d1f7f3ef252a9e505789af80a2ace
-rw-r--r--Android.mk4
-rwxr-xr-xjni/Android.mk2
-rw-r--r--src/com/android/camera/imageprocessor/FrameProcessor.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index cb4d356..3d67113 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 964bd9b..436ad2b 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 6a20911..3e1d608 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");
}
}