Merge pull request #10537 from pnemonic78:master_false

pull/10545/head
Alexander Alekhin 7 years ago
commit ee35263e48
  1. 4
      modules/java/generator/src/java/android+AsyncServiceHelper.java
  2. 4
      modules/java/generator/src/java/android+StaticHelper.java

@ -351,7 +351,7 @@ class AsyncServiceHelper
{ {
Log.d(TAG, "Cannot load library \"" + AbsPath + "\""); Log.d(TAG, "Cannot load library \"" + AbsPath + "\"");
e.printStackTrace(); e.printStackTrace();
result &= false; result = false;
} }
return result; return result;
@ -377,7 +377,7 @@ class AsyncServiceHelper
{ {
// 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_java3.so";
result &= loadLibrary(AbsLibraryPath); result = loadLibrary(AbsLibraryPath);
} }
return result; return result;

@ -68,7 +68,7 @@ class StaticHelper {
{ {
Log.d(TAG, "Cannot load library \"" + Name + "\""); Log.d(TAG, "Cannot load library \"" + Name + "\"");
e.printStackTrace(); e.printStackTrace();
result &= false; result = false;
} }
return result; return result;
@ -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_java3");
} }
return result; return result;

Loading…
Cancel
Save