Update NDK build targets (Android-16)

niqdev · Aug 8, 2019 · 141573b · 141573b · mViolette · Oct 31, 2019
1 parent 69cfbb3
commit 141573b
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/mjpeg-view/src/main/jni/Application.mk b/mjpeg-view/src/main/jni/Application.mk
@@ -1,3 +1,3 @@
 # The ARMv7 is significanly faster due to the use of the hardware FPU
-APP_ABI := armeabi armeabi-v7a mips x86
-APP_PLATFORM := android-8
+APP_ABI := armeabi-v7a x86 arm64-v8a
+APP_PLATFORM := android-16
diff --git a/mjpeg-view/src/main/jni/ImageProc/ImageProc.c b/mjpeg-view/src/main/jni/ImageProc/ImageProc.c
@@ -271,7 +271,7 @@ int Java_com_github_niqdev_mjpeg_MjpegInputStreamNative_pixeltobmp( JNIEnv* env,
 		int height = IMG_HEIGHT;
 
 
-			if(bmp==NULL) return;
+			if(bmp==NULL) return -1;
 			if ((ret = AndroidBitmap_getInfo(env, bmp, &info)) < 0) {
 				LOGE("AndroidBitmap_getInfo() failed ! error=%d", ret);
 				(*env)->ReleaseByteArrayElements(env, jp, p, 0);
@@ -305,7 +305,7 @@ int Java_com_github_niqdev_mjpeg_MjpegInputStreamNative_pixeltobmp( JNIEnv* env,
 			AndroidBitmap_unlockPixels(env, bmp);
 
 		(*env)->ReleaseByteArrayElements(env, jp, p, 0);
-		
+
 		return 0;
 }
 

diff --git a/mjpeg-view/src/main/jniLibs/arm64-v8a/libImageProc.so b/mjpeg-view/src/main/jniLibs/arm64-v8a/libImageProc.so
diff --git a/mjpeg-view/src/main/jniLibs/armeabi-v7a/libImageProc.so b/mjpeg-view/src/main/jniLibs/armeabi-v7a/libImageProc.so
diff --git a/mjpeg-view/src/main/jniLibs/armeabi/libImageProc.so b/mjpeg-view/src/main/jniLibs/armeabi/libImageProc.so
diff --git a/mjpeg-view/src/main/jniLibs/mips/libImageProc.so b/mjpeg-view/src/main/jniLibs/mips/libImageProc.so
diff --git a/mjpeg-view/src/main/jniLibs/x86/libImageProc.so b/mjpeg-view/src/main/jniLibs/x86/libImageProc.so