diff --git a/modules/java/generator/src/java/android+OpenCVLoader.java b/modules/java/generator/src/java/android+OpenCVLoader.java index 339ea2d9d7..9c0db37fe9 100644 --- a/modules/java/generator/src/java/android+OpenCVLoader.java +++ b/modules/java/generator/src/java/android+OpenCVLoader.java @@ -62,6 +62,11 @@ public class OpenCVLoader */ public static final String OPENCV_VERSION_3_0_0 = "3.0.0"; + /** + * OpenCV Library version 3.1.0. + */ + public static final String OPENCV_VERSION_3_0_0 = "3.1.0"; + /** * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java"). diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 5321aef750..f262a45467 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -166,7 +166,7 @@ class Builder: # Add extra data apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True) apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True) - for ver, d in self.extra_packs + [("3.0.0", os.path.join(self.libdest, "lib"))]: + for ver, d in self.extra_packs + [("3.1.0", os.path.join(self.libdest, "lib"))]: r = ET.Element("library", attrib={"version": ver}) log.info("Adding libraries from %s", d) diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml index 992f5f048a..ef1cab2a0e 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="310@ANDROID_PLATFORM_ID@" + android:versionName="3.10"> diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java index eccc36c9d2..917a64111e 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java +++ b/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java @@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service { @Override public int getEngineVersion() throws RemoteException { - int version = 3000; + int version = 3100; try { version = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; } catch (NameNotFoundException e) { diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index 5bd773b0e6..82cac62553 100644 --- a/platforms/android/service/readme.txt +++ b/platforms/android/service/readme.txt @@ -10,14 +10,14 @@ from Google Play. If Google Play is not available (i.e. on emulator, developer board, etc), you can install it manually using adb tool: - adb install /apk/OpenCV_3.0.0_Manager_3.00_.apk + adb install /apk/OpenCV_3.1.0_Manager_3.10_.apk Use the list below to determine proper OpenCV Manager package for your device: -- OpenCV_3.0.0-dev_Manager_3.00_armeabi.apk - armeabi (ARMv5, ARMv6) -- OpenCV_3.0.0-dev_Manager_3.00_armeabi-v7a.apk - armeabi-v7a (ARMv7-A + NEON) -- OpenCV_3.0.0-dev_Manager_3.00_arm64-v8a.apk - arm64-v8a (ARM64-v8a) -- OpenCV_3.0.0-dev_Manager_3.00_mips.apk - mips (MIPS) -- OpenCV_3.0.0-dev_Manager_3.00_mips64.apk - mips64 (MIPS64) -- OpenCV_3.0.0-dev_Manager_3.00_x86.apk - x86 -- OpenCV_3.0.0-dev_Manager_3.00_x86_64.apk - x86_64 +- OpenCV_3.1.0-dev_Manager_3.10_armeabi.apk - armeabi (ARMv5, ARMv6) +- OpenCV_3.1.0-dev_Manager_3.10_armeabi-v7a.apk - armeabi-v7a (ARMv7-A + NEON) +- OpenCV_3.1.0-dev_Manager_3.10_arm64-v8a.apk - arm64-v8a (ARM64-v8a) +- OpenCV_3.1.0-dev_Manager_3.10_mips.apk - mips (MIPS) +- OpenCV_3.1.0-dev_Manager_3.10_mips64.apk - mips64 (MIPS64) +- OpenCV_3.1.0-dev_Manager_3.10_x86.apk - x86 +- OpenCV_3.1.0-dev_Manager_3.10_x86_64.apk - x86_64