Fixed Android tests and samples status in cmake report; restored java tests "coverage calculation".

CMakeLists.txt

@@ -461,20 +461,13 @@ if((NOT DEFINED BUILD_opencv_java OR BUILD_opencv_java) AND PYTHON_EXECUTABLE)
   endif()
   include(cmake/OpenCVDetectApacheAnt.cmake REQUIRED)
 
-  if(ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_SDK_TARGET_LEVEL GREATER 7))
+  if(ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_TOOLS_Pkg_Revision GREATER 13))
     SET(CAN_BUILD_ANDROID_PROJECTS TRUE)
   else()
     SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
   endif()
 endif()
 
-if(BUILD_ANDROID_EXAMPLES AND NOT CAN_BUILD_ANDROID_PROJECTS)
-  if(HAVE_opencv_java)
-    message(WARNING "Android examples are chosen for build, but required SDK tools are not found.")
-  endif()
-  unset(BUILD_ANDROID_EXAMPLES CACHE)
-endif()
-
 ############################### QT ################################
 set(HAVE_QT 0)
 set(HAVE_QT_OPENGL 0)

modules/java/CMakeLists.txt

@@ -21,7 +21,6 @@ set(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/gen_java.py")
 set(HDR_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py")
 set(GEN_JAVADOC "${CMAKE_CURRENT_SOURCE_DIR}/gen_javadoc.py")
 set(RST_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/rst_parser.py")
-set(CHECK_TEST_COVERAGE "${CMAKE_CURRENT_SOURCE_DIR}/check-tests.py")
 
 # add dependencies to cmake (we should rerun cmake if any of these scripts is modified)
 configure_file("${GEN_JAVA}" "${OpenCV_BINARY_DIR}/junk/gen_java.junk" COPYONLY)
@@ -260,12 +259,4 @@ endif(ANDROID)
 #android test project
 if(ANDROID AND BUILD_TESTS)
   add_subdirectory(android_test)
- # add_android_project(opencv_test_java "${CMAKE_CURRENT_SOURCE_DIR}/android_test")
-
-#  if(PYTHON_EXECUTABLE)
- #   add_custom_command(
-  #      TARGET opencv_test_java_android_project POST_BUILD
-   #     COMMAND ${PYTHON_EXECUTABLE} ${CHECK_TEST_COVERAGE} "${CMAKE_CURRENT_SOURCE_DIR}/android_test/src" "${OpenCV_BINARY_DIR}/src" > "${CMAKE_CURRENT_BINARY_DIR}/tests_coverage.log"
-    #    )
- # endif()
 endif()

modules/java/android_test/CMakeLists.txt

@@ -57,3 +57,9 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E
 
 add_dependencies(opencv_tests ${PROJECT_NAME})
 
+if(PYTHON_EXECUTABLE)
+  set(CHECK_TEST_COVERAGE "${OPENCV_MODULE_opencv_java_LOCATION}/check-tests.py")
+  add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+      COMMAND ${PYTHON_EXECUTABLE} ${CHECK_TEST_COVERAGE} "${CMAKE_CURRENT_SOURCE_DIR}/src" "${OpenCV_BINARY_DIR}/src" > "${CMAKE_CURRENT_BINARY_DIR}/tests_coverage.log"
+      )
+endif()