OpenCV for Android SDK installation improved;

ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8707e01..7c3932a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -459,7 +459,7 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
   add_subdirectory(samples)
 endif()
 
-if(BUILD_ANDROID_SERVICE)
+if(ANDROID)
   add_subdirectory(android/service)
 endif()
 

diff --git a/android/service/CMakeLists.txt b/android/service/CMakeLists.txt
index c5fb11d..dde1455 100644 (file)
--- a/android/service/CMakeLists.txt
+++ b/android/service/CMakeLists.txt
@@ -1,2 +1,6 @@
-add_subdirectory(engine)
-#add_subdirectory(engine_test)
+if(BUILD_ANDROID_SERVICE)
+  add_subdirectory(engine)
+  #add_subdirectory(engine_test)
+endif()
+
+install(FILES "readme.txt" DESTINATION "apk/" COMPONENT main)

diff --git a/android/service/ReadMe.txt b/android/service/ReadMe.txt
deleted file mode 100644 (file)
index cd89762..0000000
--- a/android/service/ReadMe.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-***************
-Package Content
-***************
-
-The package provides new OpenCV SDK that uses OpenCV Manager for library initialization. OpenCV Manager provides the following benefits:
-
-* Less memory usage. All apps use the same binaries from service and do not keep native libs inside them self;
-* Hardware specific optimizations for all supported platforms;
-* Trusted OpenCV library source. All packages with OpenCV are published on Google Play service;
-* Regular updates and bug fixes;
- 
-Package consists from Library Project for Java development with Eclipse, C++ headers and libraries for native application development, javadoc samples and prebuilt binaries for ARM and X86 platforms.
-To try new SDK on serial device with Google Play just install sample package and follow application messages (Google Play service access will be needed).
-TO start example on device without Google Play you need to install OpenCV manager package and OpenCV binary pack for your platform from apk folder before.
-See docs/doc/tutorials/introduction/android_binary_package/android_binary_package.html and docs/android/refmain.html for details about service.
-On-line documentation will be available at address: http://docs.opencv.org/trunk
-
-********
-Contacts
-********
-
-Please send all feedback to Alexander Smorkalov mailto: alexander.smorkalov@itseez.com
\ No newline at end of file

diff --git a/android/service/readme.txt b/android/service/readme.txt
new file mode 100644 (file)
index 0000000..69b6236
--- /dev/null
+++ b/android/service/readme.txt
@@ -0,0 +1,28 @@
+OpenCV Manager selection
+========================
+
+Since version 1.7 several packages of OpenCV Manager is built. Every package includes OpenCV library
+for package target platform. The internal library is used for most cases, except the rare one, when
+arm-v7a without NEON instruction set processor is detected. In this case additional binary package
+for arm-v7a 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.
+For such case, when Google Play is not available, i.e. emulator, developer board, etc, you can
+install it manually using adb tool:
+
+    adb install OpenCV-2.4.3-android-sdk/apk/OpenCV_2.4.3.2_Manager_2.4_<platform_name>.apk
+
+Use table to determine right OpenCV Manager package:
+
++----------------------------+-----------------+-----------------------------------------------------+
+| Hardware Platform          | Android version | Package name                                        |
++============================+=================+=====================================================+
+| Intel x86                  | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_x86.apk                  |
++----------------------------+-----------------+-----------------------------------------------------+
+| MIPS                       | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_mips.apk                 |
++----------------------------+-----------------+-----------------------------------------------------+
+| armeabi (arm-v5, arm-v6)   | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_armeabi.apk              |
++----------------------------+-----------------+-----------------------------------------------------+
+| armeabi-v7a (arm-v7a-NEON) | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon.apk          |
++----------------------------+-----------------+-----------------------------------------------------+
+| armeabi-v7a (arm-v7a-NEON) | 2.2             | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon-android8.apk |
++----------------------------+-----------------+-----------------------------------------------------+

diff --git a/samples/ocl/CMakeLists.txt b/samples/ocl/CMakeLists.txt
index 204c458..40fe0e6 100644 (file)
--- a/samples/ocl/CMakeLists.txt
+++ b/samples/ocl/CMakeLists.txt
@@ -55,7 +55,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
   endforeach()
 endif()
 
-if (NOT WIN32)
+if (INSTALL_C_EXAMPLES AND NOT WIN32)
   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
   install(FILES ${install_list}
           DESTINATION share/opencv/samples/${project}