Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NDK build targets (Android-16) #81

Merged
merged 1 commit into from
Aug 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mjpeg-view/src/main/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions mjpeg-view/src/main/jni/ImageProc/ImageProc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down
Binary file not shown.
Binary file modified mjpeg-view/src/main/jniLibs/armeabi-v7a/libImageProc.so
Binary file not shown.
Binary file removed mjpeg-view/src/main/jniLibs/armeabi/libImageProc.so
Binary file not shown.
Binary file removed mjpeg-view/src/main/jniLibs/mips/libImageProc.so
Binary file not shown.
Binary file modified mjpeg-view/src/main/jniLibs/x86/libImageProc.so
Binary file not shown.