tree 117ddfaecefcbe3b5e14f283a6e6e642891a2fe3
parent 97944e01b0a632cfeffaa06d211f7425f342d926
parent 005e2cdfb05d92e1b24df2d35ea10ac557b3d831
author Brad King <brad.king@kitware.com> 1614787912 +0000
committer Kitware Robot <kwrobot@kitware.com> 1614787918 -0500

Merge topic 'android-r22' into release-3.20

005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862