mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-07 22:59:56 -05:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user