echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: update documentation for NDK integration

Browse Source
This commit is contained in:
Haibo Huang 2020-12-07 17:44:39 -08:00 committed by Brad King
parent e94f00dfe3
commit 1a4b1cca1c
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Help/manual/cmake-toolchains.7.rst
View File

@ -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>`.

12
Help/release/dev/android-ndk.rst Normal file
View File

@ -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``.