From c6aa97c9aab9d58855ad64a22ad0f4d1cb739ed8 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 3 Apr 2018 16:41:48 +0300 Subject: [PATCH] next(android): java3 -> java4 --- cmake/OpenCVGenAndroidMK.cmake | 2 +- .../android_binary_package/android_ocl_intro.markdown | 4 ++-- modules/java/android_sdk/build.gradle.in | 2 +- .../android/java/org/opencv/android/AsyncServiceHelper.java | 2 +- .../android/java/org/opencv/android/StaticHelper.java | 2 +- .../src/org/opencv/samples/tutorial4/NativePart.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/OpenCVGenAndroidMK.cmake b/cmake/OpenCVGenAndroidMK.cmake index 832ed67533..ebf25d72a6 100644 --- a/cmake/OpenCVGenAndroidMK.cmake +++ b/cmake/OpenCVGenAndroidMK.cmake @@ -48,7 +48,7 @@ if(ANDROID) string(REPLACE "opencv_" "" OPENCV_MODULES_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}") if(BUILD_FAT_JAVA_LIB) - set(OPENCV_LIBS_CONFIGMAKE java3) + set(OPENCV_LIBS_CONFIGMAKE java4) else() set(OPENCV_LIBS_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}") endif() diff --git a/doc/tutorials/introduction/android_binary_package/android_ocl_intro.markdown b/doc/tutorials/introduction/android_binary_package/android_ocl_intro.markdown index 3dab6e8c98..b41f91b241 100644 --- a/doc/tutorials/introduction/android_binary_package/android_ocl_intro.markdown +++ b/doc/tutorials/introduction/android_binary_package/android_ocl_intro.markdown @@ -144,7 +144,7 @@ Here is a simple Java wrapper for our JNI stuff: public class NativeGLRenderer { static { - System.loadLibrary("opencv_java3"); // comment this when using OpenCV Manager + System.loadLibrary("opencv_java4"); // comment this when using OpenCV Manager System.loadLibrary("JNIrender"); } @@ -383,7 +383,7 @@ Unfortunately `UMat` keeps OpenCL _buffer_ internally, that can't be wrapped ove path/to/cmake.exe -GNinja -DCMAKE_MAKE_PROGRAM="path/to/ninja.exe" -DCMAKE_TOOLCHAIN_FILE=path/to/opencv/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON path/to/opencv path/to/ninja.exe install/strip @endcode - To use your own modified `libopencv_java3.so` you have to keep inside your APK, not to use OpenCV Manager and load it manually via `System.loadLibrary("opencv_java3")`. + To use your own modified `libopencv_java4.so` you have to keep inside your APK, not to use OpenCV Manager and load it manually via `System.loadLibrary("opencv_java4")`. Performance notes ----------------- diff --git a/modules/java/android_sdk/build.gradle.in b/modules/java/android_sdk/build.gradle.in index 6d317fcd39..f4c260e40d 100644 --- a/modules/java/android_sdk/build.gradle.in +++ b/modules/java/android_sdk/build.gradle.in @@ -49,7 +49,7 @@ // - avoid using of "OpenCVLoader.initAsync()" approach - it is deprecated // It may load library with different version (from OpenCV Android Manager, which is installed separatelly on device) // -// - use "System.loadLibrary("opencv_java3")" or "OpenCVLoader.initDebug()" +// - use "System.loadLibrary("opencv_java4")" or "OpenCVLoader.initDebug()" // TODO: Add accurate API to load OpenCV native library // // diff --git a/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java b/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java index 04a4ac6257..a718ca3c5d 100644 --- a/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java +++ b/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java @@ -376,7 +376,7 @@ class AsyncServiceHelper else { // If the dependencies list is not defined or empty. - String AbsLibraryPath = Path + File.separator + "libopencv_java3.so"; + String AbsLibraryPath = Path + File.separator + "libopencv_java4.so"; result = loadLibrary(AbsLibraryPath); } diff --git a/modules/java/generator/android/java/org/opencv/android/StaticHelper.java b/modules/java/generator/android/java/org/opencv/android/StaticHelper.java index f670d933e6..934dd7570c 100644 --- a/modules/java/generator/android/java/org/opencv/android/StaticHelper.java +++ b/modules/java/generator/android/java/org/opencv/android/StaticHelper.java @@ -92,7 +92,7 @@ class StaticHelper { else { // If dependencies list is not defined or empty. - result = loadLibrary("opencv_java3"); + result = loadLibrary("opencv_java4"); } return result; diff --git a/samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/NativePart.java b/samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/NativePart.java index e5f11ba3ae..e3d11709a9 100644 --- a/samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/NativePart.java +++ b/samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/NativePart.java @@ -3,7 +3,7 @@ package org.opencv.samples.tutorial4; public class NativePart { static { - System.loadLibrary("opencv_java3"); + System.loadLibrary("opencv_java4"); System.loadLibrary("JNIpart"); }