diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-21 12:23:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-21 12:42:25 (GMT) |
| commit | 43f4326ece5035a5a028a7bb90a67c193804c997 (patch) | |
| tree | 09eeeb57da312a78c7b410365e28142b3e33502c /Tests | |
| parent | a0c539b5460da283433976053ea181f07fcea32e (diff) | |
| download | CMake-43f4326ece5035a5a028a7bb90a67c193804c997.zip CMake-43f4326ece5035a5a028a7bb90a67c193804c997.tar.gz CMake-43f4326ece5035a5a028a7bb90a67c193804c997.tar.bz2 | |
Android: Fix support for armeabi with c++_static
Add missing "unwind" and "atomic" libraries needed for this combination.
See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the
libraries the NDK uses.
Issue: #16380
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Android/RunCMakeTest.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Tests/RunCMake/Android/RunCMakeTest.cmake b/Tests/RunCMake/Android/RunCMakeTest.cmake index 39b77cd..86a9896 100644 --- a/Tests/RunCMake/Android/RunCMakeTest.cmake +++ b/Tests/RunCMake/Android/RunCMakeTest.cmake @@ -174,11 +174,6 @@ foreach(ndk IN LISTS TEST_ANDROID_NDK) continue() endif() - # Skip combinations that seem to be broken. - if("${stl};${abi}" MATCHES [[^c\+\+_static;armeabi]]) - continue() - endif() - # Run the tests for this combination. if("${abi}" STREQUAL "armeabi") run_Android(ndk-armeabi-thumb) # default: -DCMAKE_ANDROID_ARCH_ABI=armeabi -DCMAKE_ANDROID_ARM_MODE=0 |