diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-09 14:15:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-09 14:15:13 (GMT) |
| commit | a2f98803f0457d62d19738003611b98054f3f518 (patch) | |
| tree | b35a55f878dcf2432109fe2f648d004021fea345 | |
| parent | acc9c89914ca184d107efd8a84282553c271de60 (diff) | |
| parent | 1a4b1cca1c1bca28c81dd9c7cb6ed4ddb73602a2 (diff) | |
| download | CMake-a2f98803f0457d62d19738003611b98054f3f518.zip CMake-a2f98803f0457d62d19738003611b98054f3f518.tar.gz CMake-a2f98803f0457d62d19738003611b98054f3f518.tar.bz2 | |
Merge topic 'android-docs'
1a4b1cca1c Android: update documentation for NDK integration
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5586
| -rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/android-ndk.rst | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst index 88cddf6..0267ca3 100644 --- a/Help/manual/cmake-toolchains.7.rst +++ b/Help/manual/cmake-toolchains.7.rst @@ -386,7 +386,8 @@ Configure use of an Android NDK with the following variables: :variable:`CMAKE_ANDROID_ARCH_ABI` Set to the Android ABI (architecture). If not specified, this - variable will default to ``armeabi``. + variable will default to the first supported ABI in the list of + ``armeabi``, ``armeabi-v7a`` and ``arm64-v8a``. The :variable:`CMAKE_ANDROID_ARCH` variable will be computed from ``CMAKE_ANDROID_ARCH_ABI`` automatically. Also see the :variable:`CMAKE_ANDROID_ARM_MODE` and @@ -394,7 +395,6 @@ Configure use of an Android NDK with the following variables: :variable:`CMAKE_ANDROID_NDK` Set to the absolute path to the Android NDK root directory. - A ``${CMAKE_ANDROID_NDK}/platforms`` directory must exist. If not specified, a default for this variable will be chosen as specified :ref:`above <Cross Compiling for Android>`. diff --git a/Help/release/dev/android-ndk.rst b/Help/release/dev/android-ndk.rst new file mode 100644 index 0000000..ee4ea5b --- /dev/null +++ b/Help/release/dev/android-ndk.rst @@ -0,0 +1,12 @@ +android-ndk +----------- + +* CMake's support for :ref:`Cross Compiling for Android` + is now merged with the Android NDK's toolchain file. + They now have similar behavior, though some variable names differ. + User-facing changes include: + + - ``find_*`` functions will search NDK ABI / API specific paths by default. + + - The default :variable:`CMAKE_BUILD_TYPE` for Android is + now ``RelWithDebInfo``. |