diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-17 14:42:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-17 15:21:15 (GMT) |
| commit | da294a039dec5e4f97da742b8e3cb94f25b82230 (patch) | |
| tree | 2d8b0553d25067b03181d4d2c6a4ebd86e27662d /Tests/RunCMake/Android | |
| parent | 12139ad009930ba00c650c03e11f4eff3a081839 (diff) | |
| download | CMake-da294a039dec5e4f97da742b8e3cb94f25b82230.zip CMake-da294a039dec5e4f97da742b8e3cb94f25b82230.tar.gz CMake-da294a039dec5e4f97da742b8e3cb94f25b82230.tar.bz2 | |
Android: Add support for NDK r17
The `armeabi` ABI is no longer available, so we can no longer use it by
default unconditionally. Instead detect all available ABIs and choose
the oldest arm ABI that is available.
Also update the test suite to account for the lack of `armeabi` support
and pass as of Android NDK r17-beta2.
Diffstat (limited to 'Tests/RunCMake/Android')
| -rw-r--r-- | Tests/RunCMake/Android/RunCMakeTest.cmake | 14 | ||||
| -rw-r--r-- | Tests/RunCMake/Android/ndk-badvernum-stderr.txt | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Tests/RunCMake/Android/RunCMakeTest.cmake b/Tests/RunCMake/Android/RunCMakeTest.cmake index 86a9896..2027c4f 100644 --- a/Tests/RunCMake/Android/RunCMakeTest.cmake +++ b/Tests/RunCMake/Android/RunCMakeTest.cmake @@ -88,12 +88,14 @@ foreach(ndk IN LISTS TEST_ANDROID_NDK) -DCMAKE_ANDROID_ARM_MODE=0 ) run_cmake(ndk-badarm) - set(RunCMake_TEST_OPTIONS - -DCMAKE_SYSTEM_NAME=Android - -DCMAKE_ANDROID_NDK=${ndk} - -DCMAKE_ANDROID_ARM_NEON=0 - ) - run_cmake(ndk-badneon) + if("armeabi" IN_LIST _abis_) + set(RunCMake_TEST_OPTIONS + -DCMAKE_SYSTEM_NAME=Android + -DCMAKE_ANDROID_NDK=${ndk} + -DCMAKE_ANDROID_ARM_NEON=0 + ) + run_cmake(ndk-badneon) + endif() set(RunCMake_TEST_OPTIONS -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=${ndk} diff --git a/Tests/RunCMake/Android/ndk-badvernum-stderr.txt b/Tests/RunCMake/Android/ndk-badvernum-stderr.txt index 25bbaf9..adacaf1 100644 --- a/Tests/RunCMake/Android/ndk-badvernum-stderr.txt +++ b/Tests/RunCMake/Android/ndk-badvernum-stderr.txt @@ -1,5 +1,5 @@ ^CMake Error at .*/Modules/Platform/Android/Determine-Compiler-NDK.cmake:[0-9]+ \(message\): - Android: No toolchain for ABI 'armeabi' found in the NDK: + Android: No toolchain for ABI 'armeabi(-v7a)?' found in the NDK: .* |