Merge topic 'android-armeabi-c++_static'

43f4326e Android: Fix support for armeabi with c++_static

Modules/Platform/Android/ndk-stl-c++_static.cmake

@@ -3,4 +3,6 @@ macro(__android_stl lang)
   __android_stl_cxx(${lang} libc++_static.a)
   __android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libc++abi.a" 0)
   __android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libandroid_support.a" 0)
+  __android_stl_lib(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_ANDROID_ARCH_ABI}/libunwind.a" 0)
+  string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -latomic") # provided by toolchain
 endmacro()

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