Merge topic 'vs-android-doc'

0a638e86b2 Help: Add note about Visual Studio tools for Android
55689ce800 Help: Add ref to Ninja Generators section

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5343

Help/manual/cmake-generators.7.rst

@@ -52,6 +52,8 @@ Makefile Generators
    /generator/Unix Makefiles
    /generator/Watcom WMake
 
+.. _`Ninja Generators`:
+
 Ninja Generators
 ^^^^^^^^^^^^^^^^
 

Help/manual/cmake-toolchains.7.rst

@@ -312,8 +312,9 @@ is specific to the Android development environment to be used.
 
 For :ref:`Visual Studio Generators`, CMake expects :ref:`NVIDIA Nsight Tegra
 Visual Studio Edition <Cross Compiling for Android with NVIDIA Nsight Tegra
-Visual Studio Edition>` to be installed.  See that section for further
-configuration details.
+Visual Studio Edition>` or the :ref:`Visual Studio tools for Android
+<Cross Compiling for Android with the NDK>` to be installed. See those sections
+for further configuration details.
 
 For :ref:`Makefile Generators` and the :generator:`Ninja` generator,
 CMake expects one of these environments:
@@ -363,8 +364,9 @@ CMake uses the following steps to select one of the environments:
 Cross Compiling for Android with the NDK
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-A toolchain file may configure :ref:`Makefile Generators` or the
-:generator:`Ninja` generator to target Android for cross-compiling.
+A toolchain file may configure :ref:`Makefile Generators`,
+:ref:`Ninja Generators`, or :ref:`Visual Studio Generators` to target
+Android for cross-compiling.
 
 Configure use of an Android NDK with the following variables: