diff --git a/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst b/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst index df18e19c5..27dd81581 100644 --- a/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst +++ b/doc/tutorials/introduction/android_binary_package/O4A_SDK.rst @@ -51,7 +51,7 @@ The structure of package contents looks as follows: OpenCV-2.4.7-android-sdk |_ apk | |_ OpenCV_2.4.7_binary_pack_armv7a.apk - | |_ OpenCV_2.4.7_Manager_2.13_XXX.apk + | |_ OpenCV_2.4.7_Manager_2.14_XXX.apk | |_ doc |_ samples @@ -295,7 +295,7 @@ Well, running samples from Eclipse is very simple: .. code-block:: sh :linenos: - /platform-tools/adb install /apk/OpenCV_2.4.7_Manager_2.13_armv7a-neon.apk + /platform-tools/adb install /apk/OpenCV_2.4.7_Manager_2.14_armv7a-neon.apk .. note:: ``armeabi``, ``armv7a-neon``, ``arm7a-neon-android8``, ``mips`` and ``x86`` stand for platform targets: diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml index 8d7894797..162d31eb0 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="214@ANDROID_PLATFORM_VERSION_CODE@" + android:versionName="2.14" > diff --git a/platforms/android/service/readme.txt b/platforms/android/service/readme.txt index 6255df5e9..1e757a0e5 100644 --- a/platforms/android/service/readme.txt +++ b/platforms/android/service/readme.txt @@ -14,20 +14,20 @@ manually using adb tool: .. code-block:: sh - adb install OpenCV-2.4.6-android-sdk/apk/OpenCV_2.4.6_Manager_2.9_.apk + adb install OpenCV-2.4.7-android-sdk/apk/OpenCV_2.4.7_Manager_2.14_.apk Use the table below to determine proper OpenCV Manager package for your device: -+------------------------------+--------------+---------------------------------------------------+ -| Hardware Platform | Android ver. | Package name | -+==============================+==============+===================================================+ -| armeabi-v7a (ARMv7-A + NEON) | >= 2.3 | OpenCV_2.4.6_Manager_2.9_armv7a-neon.apk | -+------------------------------+--------------+---------------------------------------------------+ -| armeabi-v7a (ARMv7-A + NEON) | = 2.2 | OpenCV_2.4.6_Manager_2.9_armv7a-neon-android8.apk | -+------------------------------+--------------+---------------------------------------------------+ -| armeabi (ARMv5, ARMv6) | >= 2.3 | OpenCV_2.4.6_Manager_2.9_armeabi.apk | -+------------------------------+--------------+---------------------------------------------------+ -| Intel x86 | >= 2.3 | OpenCV_2.4.6_Manager_2.9_x86.apk | -+------------------------------+--------------+---------------------------------------------------+ -| MIPS | >= 2.3 | OpenCV_2.4.6_Manager_2.9_mips.apk | -+------------------------------+--------------+---------------------------------------------------+ ++------------------------------+--------------+----------------------------------------------------+ +| Hardware Platform | Android ver. | Package name | ++==============================+==============+====================================================+ +| armeabi-v7a (ARMv7-A + NEON) | >= 2.3 | OpenCV_2.4.7_Manager_2.14_armv7a-neon.apk | ++------------------------------+--------------+----------------------------------------------------+ +| armeabi-v7a (ARMv7-A + NEON) | = 2.2 | OpenCV_2.4.7_Manager_2.14_armv7a-neon-android8.apk | ++------------------------------+--------------+----------------------------------------------------+ +| armeabi (ARMv5, ARMv6) | >= 2.3 | OpenCV_2.4.7_Manager_2.14_armeabi.apk | ++------------------------------+--------------+----------------------------------------------------+ +| Intel x86 | >= 2.3 | OpenCV_2.4.7_Manager_2.14_x86.apk | ++------------------------------+--------------+----------------------------------------------------+ +| MIPS | >= 2.3 | OpenCV_2.4.7_Manager_2.14_mips.apk | ++------------------------------+--------------+----------------------------------------------------+