Commit c6aa97c9 authored by Alexander Alekhin's avatar Alexander Alekhin

next(android): java3 -> java4

parent 250941bd
...@@ -48,7 +48,7 @@ if(ANDROID) ...@@ -48,7 +48,7 @@ if(ANDROID)
string(REPLACE "opencv_" "" OPENCV_MODULES_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}") string(REPLACE "opencv_" "" OPENCV_MODULES_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}")
if(BUILD_FAT_JAVA_LIB) if(BUILD_FAT_JAVA_LIB)
set(OPENCV_LIBS_CONFIGMAKE java3) set(OPENCV_LIBS_CONFIGMAKE java4)
else() else()
set(OPENCV_LIBS_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}") set(OPENCV_LIBS_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}")
endif() endif()
......
...@@ -144,7 +144,7 @@ Here is a simple Java wrapper for our JNI stuff: ...@@ -144,7 +144,7 @@ Here is a simple Java wrapper for our JNI stuff:
public class NativeGLRenderer { public class NativeGLRenderer {
static static
{ {
System.loadLibrary("opencv_java3"); // comment this when using OpenCV Manager System.loadLibrary("opencv_java4"); // comment this when using OpenCV Manager
System.loadLibrary("JNIrender"); System.loadLibrary("JNIrender");
} }
...@@ -383,7 +383,7 @@ Unfortunately `UMat` keeps OpenCL _buffer_ internally, that can't be wrapped ove ...@@ -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/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 path/to/ninja.exe install/strip
@endcode @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 Performance notes
----------------- -----------------
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
// - avoid using of "OpenCVLoader.initAsync()" approach - it is deprecated // - 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) // 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 // TODO: Add accurate API to load OpenCV native library
// //
// //
......
...@@ -376,7 +376,7 @@ class AsyncServiceHelper ...@@ -376,7 +376,7 @@ class AsyncServiceHelper
else else
{ {
// If the dependencies list is not defined or empty. // 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); result = loadLibrary(AbsLibraryPath);
} }
......
...@@ -92,7 +92,7 @@ class StaticHelper { ...@@ -92,7 +92,7 @@ class StaticHelper {
else else
{ {
// If dependencies list is not defined or empty. // If dependencies list is not defined or empty.
result = loadLibrary("opencv_java3"); result = loadLibrary("opencv_java4");
} }
return result; return result;
......
...@@ -3,7 +3,7 @@ package org.opencv.samples.tutorial4; ...@@ -3,7 +3,7 @@ package org.opencv.samples.tutorial4;
public class NativePart { public class NativePart {
static static
{ {
System.loadLibrary("opencv_java3"); System.loadLibrary("opencv_java4");
System.loadLibrary("JNIpart"); System.loadLibrary("JNIpart");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment