diff --git a/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst b/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst index 91ffda695a..d004132d0f 100644 --- a/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst +++ b/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst @@ -37,10 +37,11 @@ following key topis: Quick environment setup for Android development =============================================== -If you are making a clean environment install, then you can try -`Tegra Android Development Pack `_ +If you are making a clean environment install, then you can try `Tegra Android Development Pack `_ (**TADP**) released by **NVIDIA**. + .. note:: Starting the *version 2.0* the TADP package includes *OpenCV for Tegra* SDK that is a regular *OpenCV4Android SDK* extended with Tegra-specific stuff. + When unpacked, TADP will cover all of the environment setup automatically and you can skip the rest of the guide. If you are a beginner in Android development then we also recommend you to start with TADP. @@ -124,20 +125,18 @@ You need the following software to be installed in order to develop for Android You need the following SDK components to be installed: - * *Android SDK Tools, revision 14* or newer. + * *Android SDK Tools, revision 20* or newer. Older revisions should also work, but they are not recommended. - * *SDK Platform Android 3.0*, ``API 11`` and *Android 2.3.1*, ``API 9``. + * *SDK Platform Android 3.0* (``API 11``). The minimal platform supported by OpenCV Java API is **Android 2.2** (``API 8``). This is also the minimum API Level required for the provided samples to run. See the ```` tag in their **AndroidManifest.xml** files. - But for successful compilation of some samples the **target** platform should be set to - Android 3.0 (API 11) or higher. It will not prevent them from running on Android 2.2. + But for successful compilation the **target** platform should be set to Android 3.0 (API 11) or higher. It will not prevent them from running on Android 2.2. .. image:: images/android_sdk_and_avd_manager.png - :height: 500px :alt: Android SDK Manager :align: center @@ -178,7 +177,13 @@ You need the following software to be installed in order to develop for Android :guilabel:`Developer Tools` and click :guilabel:`Next`. #. In the next window, you'll see a list of the tools to be downloaded. Click :guilabel:`Next`. - .. TODO: Here we need user to check the presence of CDT plugin. + .. note:: If you also plan to develop native C++ code with Android NDK don't forget to + enable `NDK Plugins` installations as well. + + .. image:: images/eclipse_inst_adt.png + :alt: ADT installation + :align: center + #. Read and accept the license agreements, then click :guilabel:`Finish`. @@ -213,15 +218,24 @@ You need the following software to be installed in order to develop for Android There are several possible ways to integrate compilation of C++ code by Android NDK into Eclipse compilation process. We recommend the approach based on Eclipse :abbr:`CDT(C/C++ Development Tooling)` Builder. - - .. note:: If you're using the latest ADT plugin for Eclipse (version 20 and above), most likely - that you already have the CDT plugin. If it is so, just skip this section. - Make sure your Eclipse IDE has the :abbr:`CDT(C/C++ Development Tooling)` plugin installed. Menu :guilabel:`Help -> About Eclipse SDK -> Installation Details`. - .. image:: images/eclipse_inst_details.png - :alt: Eclipse About + .. image:: images/eclipse_about_cdt_0.png + :alt: CDT in Eclipse About + :align: center + + .. + + .. image:: images/eclipse_about_cdt_1.png + :alt: CDT in Eclipse About + :align: center + + .. note:: If you're using the latest ADT plugin for Eclipse (version 20 and above), most likely + you already have the CDT plugin and don't need to install it. + + .. image:: images/eclipse_about_cdt_1.png + :alt: CDT in Eclipse About :align: center To install the `CDT plugin `_ use menu @@ -656,4 +670,4 @@ What's next =========== Now, when you have your development environment set up and configured, you may want to proceed to -installing OpenCV4Android SDK. You can learn how to do that in a separate :ref:`O4A_SDK` tutorial. \ No newline at end of file +installing OpenCV4Android SDK. You can learn how to do that in a separate :ref:`O4A_SDK` tutorial. diff --git a/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png b/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png index 46ddebba7f..cf5eb7d1ab 100644 Binary files a/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png and b/doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_0.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_0.png new file mode 100644 index 0000000000..79e43690bf Binary files /dev/null and b/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_0.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_1.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_1.png new file mode 100644 index 0000000000..9b2c9b136c Binary files /dev/null and b/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_1.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_2.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_2.png new file mode 100644 index 0000000000..c061a2074c Binary files /dev/null and b/doc/tutorials/introduction/android_binary_package/images/eclipse_about_cdt_2.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_inst_adt.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_inst_adt.png new file mode 100644 index 0000000000..94491e0a61 Binary files /dev/null and b/doc/tutorials/introduction/android_binary_package/images/eclipse_inst_adt.png differ diff --git a/doc/tutorials/introduction/android_binary_package/images/eclipse_inst_details.png b/doc/tutorials/introduction/android_binary_package/images/eclipse_inst_details.png deleted file mode 100644 index 246d14c3e1..0000000000 Binary files a/doc/tutorials/introduction/android_binary_package/images/eclipse_inst_details.png and /dev/null differ