Fixed Android samples; Fixed bugs in cmake (java module).

doc/tutorials/definitions/tocDefinitions.rst

@@ -1,5 +1,6 @@
 .. |Author_AnaH| unicode:: Ana U+0020 Huam U+00E1 n
 .. |Author_BernatG| unicode:: Bern U+00E1 t U+0020 G U+00E1 bor
+.. |Author_AndreyK| unicode:: Andrey U+0020 Kamaev
 
 
 

doc/tutorials/introduction/android_binary_package/android_binary_package.rst

@@ -0,0 +1,38 @@
+.. _Android_Binary_Package:
+
+Using Android binary package with Eclipse
+*****************************************
+
+.. include:: <isonum.txt>
+
+This tutorial was tested using Ubuntu 10.04 and Windows 7 SP1 operating systems. Nevertheless, it should also work on any other **OS**\ es supported by Android SDK (including Mac OS X). If you encounter errors after following the steps described here feel free to contact us via *android-opencv* disscussion group https://groups.google.com/group/android-opencv/ and we will try to fix your problem.
+
+.. _Android_Environment_Setup_Lite: 
+
+Setup environment to start Android Development
+==============================================
+
+You need the following tools to be installed:
+
+1. **Sun JDK 6**
+
+   Visit http://www.oracle.com/technetwork/java/javase/downloads/index.html and download installer for your OS.
+
+   Here is detailed JDK installation guide for Ubuntu and Mac OS: http://source.android.com/source/initializing.html (only JDK sections are applicable for OpenCV)
+
+   .. note:: OpenJDK is not usable for Android development because Android SDK supports only Sun JDK.
+
+#. **Android SDK**
+
+   Get the latest Android SDK from http://developer.android.com/sdk/index.html
+
+   Here is Google's install guide for SDK http://developer.android.com/sdk/installing.html
+
+   .. note:: If you choose SDK packed into Windows installer then you should have installed 32-bit JRE. It does not needed for Android development but installer is x86 application and requires 32-bit Java runtime.
+
+   .. note:: If you are running x64 version of Ubuntu Linux then you need ia32 shared libraries for use on amd64 and ia64 systems installed. You can install them with following command:
+
+      .. code-block:: bash
+
+         sudo apt-get install ia32-libs
+

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -97,9 +97,29 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   =========== ======================================================
 
-  .. |WinVSHowT| image:: images/visual-studio-2010-logo.jpg
-                 :height: 90pt
-                 :width:  90pt
+     .. |WinVSHowT| image:: images/visual-studio-2010-logo.jpg
+                      :height: 90pt
+                      :width:  90pt
+
+* **Android**
+
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+    
+  ================ ======================================================
+  |AndroidBinPack| **Title:** :ref:`Android_Binary_Package`
+
+                   *Compatibility:* > OpenCV 2.3.1
+
+                   *Author:* |Author_AndreyK|
+
+                   You will learn how to setup OpenCV for Android platform!
+
+  ================ ======================================================
+
+     .. |AndroidBinPack| image:: images/android_logo.png
+                           :height: 90pt
+                           :width:  90pt
 
 * **From where to start?**
 
@@ -148,5 +168,6 @@ Here you can read tutorials about how to set up your computer to work with the O
    ../linux_eclipse/linux_eclipse
    ../windows_install/windows_install
    ../windows_visual_studio_Opencv/windows_visual_studio_Opencv
+   ../android_binary_package/android_binary_package
    ../display_image/display_image
    ../load_save_image/load_save_image