Merge pull request #4132 from mshabunin:fix-java-package

cmake/OpenCVGenAndroidMK.cmake

@@ -30,13 +30,6 @@ if(ANDROID)
   # replace 'opencv_<module>' -> '<module>''
   string(REPLACE "opencv_" "" OPENCV_MODULES_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}")
 
-
-  # prepare 3rd-party component list without TBB for armeabi and mips platforms. TBB is useless there.
-  set(OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE_NO_TBB ${OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE})
-  foreach(mod ${OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE_NO_TBB})
-     string(REPLACE "tbb" "" OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE_NO_TBB "${OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE_NO_TBB}")
-  endforeach()
-
   if(BUILD_FAT_JAVA_LIB)
     set(OPENCV_LIBS_CONFIGMAKE java3)
   else()
@@ -52,6 +45,7 @@ if(ANDROID)
   set(OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/3rdparty/lib/\$(OPENCV_TARGET_ARCH_ABI)")
 
   configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/OpenCV.mk" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV-abi.mk.in" "${CMAKE_BINARY_DIR}/OpenCV-${ANDROID_NDK_ABI_NAME}.mk" @ONLY)
 
   # -------------------------------------------------------------------------------------------
   #  Part 2/2: ${BIN_DIR}/unix-install/OpenCV.mk -> For use with "make install"
@@ -62,5 +56,7 @@ if(ANDROID)
   set(OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../3rdparty/libs/\$(OPENCV_TARGET_ARCH_ABI)")
 
   configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV-abi.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV-${ANDROID_NDK_ABI_NAME}.mk" @ONLY)
   install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev)
+  install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV-${ANDROID_NDK_ABI_NAME}.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev)
 endif(ANDROID)

cmake/templates/OpenCV-abi.mk.in

+OPENCV_3RDPARTY_COMPONENTS:=@OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE@
+OPENCV_EXTRA_COMPONENTS:=@OPENCV_EXTRA_COMPONENTS_CONFIGMAKE@

cmake/templates/OpenCV.mk.in

@@ -19,6 +19,7 @@ OPENCV_3RDPARTY_LIBS_DIR:=@OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE@
 OPENCV_BASEDIR:=@OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE@
 OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@
 OPENCV_MODULES:=@OPENCV_MODULES_CONFIGMAKE@
+OPENCV_SUB_MK:=$(call my-dir)/OpenCV-$(TARGET_ARCH_ABI).mk
 
 ifeq ($(OPENCV_LIB_TYPE),)
     OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@
@@ -36,22 +37,7 @@ ifeq ($(OPENCV_LIB_TYPE),SHARED)
     OPENCV_3RDPARTY_COMPONENTS:=
     OPENCV_EXTRA_COMPONENTS:=
 else
-    ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-        OPENCV_3RDPARTY_COMPONENTS:=@OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE@
-        OPENCV_EXTRA_COMPONENTS:=@OPENCV_EXTRA_COMPONENTS_CONFIGMAKE@
-    endif
-    ifeq ($(TARGET_ARCH_ABI),x86)
-        OPENCV_3RDPARTY_COMPONENTS:=@OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE@
-        OPENCV_EXTRA_COMPONENTS:=@OPENCV_EXTRA_COMPONENTS_CONFIGMAKE@
-    endif
-    ifeq ($(TARGET_ARCH_ABI),armeabi)
-        OPENCV_3RDPARTY_COMPONENTS:=@OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE_NO_TBB@
-        OPENCV_EXTRA_COMPONENTS:=@OPENCV_EXTRA_COMPONENTS_CONFIGMAKE@
-    endif
-    ifeq ($(TARGET_ARCH_ABI),mips)
-        OPENCV_3RDPARTY_COMPONENTS:=@OPENCV_3RDPARTY_COMPONENTS_CONFIGMAKE@
-        OPENCV_EXTRA_COMPONENTS:=@OPENCV_EXTRA_COMPONENTS_CONFIGMAKE@
-    endif
+    include $(OPENCV_SUB_MK)
 endif
 
 ifeq ($(OPENCV_LIB_TYPE),SHARED)

modules/java/CMakeLists.txt

@@ -369,6 +369,7 @@ set_target_properties(${the_module} PROPERTIES
 
 if(ANDROID)
   ocv_target_link_libraries(${the_module} jnigraphics) # for Mat <=> Bitmap converters
+  ocv_target_link_libraries(${the_module} LINK_INTERFACE_LIBRARIES ${OPENCV_LINKER_LIBS} jnigraphics)
 
   # force strip library after the build command
   # because samples and tests will make a copy of the library before install

platforms/android/service/readme.txt

@@ -2,32 +2,22 @@ How to select the proper version of OpenCV Manager
 --------------------------------------------------
 
 Since version 1.7 several packages of OpenCV Manager are built. Every package is targeted for some
-specific hardware platform and includes corresponding OpenCV binaries. So, in most cases OpenCV
-Manager uses built-in version of OpenCV. Separate package with OpenCV binaries is currently used in
-a single rare case, when an ARMv7-A processor without NEON support is detected. In this case an
-additional binary package is used. The new package selection logic in most cases simplifies OpenCV
-installation on end user devices. In most cases OpenCV Manager may be installed automatically from
-Google Play.
+specific hardware platform and includes corresponding OpenCV binaries. So, in all cases OpenCV
+Manager uses built-in version of OpenCV. The new package selection logic in most cases simplifies
+OpenCV installation on end user devices. In most cases OpenCV Manager may be installed automatically
+from Google Play.
 
 If Google Play is not available (i.e. on emulator, developer board, etc), you can install it
 manually using adb tool:
 
-.. code-block:: sh
+    adb install <path-to-OpenCV-sdk>/apk/OpenCV_3.0.0_Manager_3.00_<platform>.apk
 
-    adb install OpenCV-2.4.9-android-sdk/apk/OpenCV_2.4.9_Manager_2.18_<platform>.apk
+Use the list below to determine proper OpenCV Manager package for your device:
 
-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.9_Manager_2.18_armv7a-neon.apk          |
-+------------------------------+--------------+----------------------------------------------------+
-| armeabi-v7a (ARMv7-A + NEON) |     = 2.2    | OpenCV_2.4.9_Manager_2.18_armv7a-neon-android8.apk |
-+------------------------------+--------------+----------------------------------------------------+
-| armeabi (ARMv5, ARMv6)       |    >= 2.3    | OpenCV_2.4.9_Manager_2.18_armeabi.apk              |
-+------------------------------+--------------+----------------------------------------------------+
-| Intel x86                    |    >= 2.3    | OpenCV_2.4.9_Manager_2.18_x86.apk                  |
-+------------------------------+--------------+----------------------------------------------------+
-| MIPS                         |    >= 2.3    | OpenCV_2.4.9_Manager_2.18_mips.apk                 |
-+------------------------------+--------------+----------------------------------------------------+
+- 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

samples/android/15-puzzle/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.opencv.samples.puzzle15"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="301"
+    android:versionName="3.01" >
 
     <uses-sdk android:minSdkVersion="8"/>
 
@@ -31,4 +32,4 @@
     <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
-</manifest>
\ No newline at end of file
+</manifest>

samples/android/camera-calibration/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.cameracalibration"
-          android:versionCode="1"
-          android:versionName="1.0">
+          android:versionCode="301"
+          android:versionName="3.01" >
 
     <application
         android:label="@string/app_name"

samples/android/color-blob-detection/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.colorblobdetect"
-          android:versionCode="21"
-          android:versionName="2.1">
+          android:versionCode="301"
+          android:versionName="3.01">
 
     <application
         android:label="@string/app_name"

samples/android/face-detection/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.facedetect"
-          android:versionCode="21"
-          android:versionName="2.1">
+          android:versionCode="301"
+          android:versionName="3.01">
 
     <application
         android:label="@string/app_name"

samples/android/image-manipulations/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.imagemanipulations"
-          android:versionCode="21"
-          android:versionName="2.1">
+          android:versionCode="301"
+          android:versionName="3.01">
 
     <application
         android:label="@string/app_name"

samples/android/tutorial-1-camerapreview/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.tutorial1"
-          android:versionCode="21"
-          android:versionName="2.1">
+          android:versionCode="301"
+          android:versionName="3.01">
 
     <application
         android:label="@string/app_name"

samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.tutorial2"
-          android:versionCode="21"
-          android:versionName="2.1">
+          android:versionCode="301"
+          android:versionName="3.01">
 
     <application
         android:label="@string/app_name"

samples/android/tutorial-3-cameracontrol/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.opencv.samples.tutorial3"
-          android:versionCode="21"
-          android:versionName="2.1">
+          android:versionCode="301"
+          android:versionName="3.01">
 
     <application
         android:label="@string/app_name"