Merge topic 'android-cxxabi'

8cdac469 Android: Fix support for cxxabi.h with libc++

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

@@ -6,9 +6,11 @@ macro(__android_stl_cxx lang filename)
   if(EXISTS "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef")
     # r12 and below
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx/include" 1)
+    __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" 1)
   else()
     # r13 and above
     __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++/include" 1)
+    __android_stl_inc(${lang} "${CMAKE_ANDROID_NDK}/sources/cxx-stl/llvm-libc++abi/include" 1)
   endif()
 
   # Add a secondary include directory if it exists.

Tests/RunCMake/Android/android.cxx

@@ -6,6 +6,9 @@
 #ifndef STL_SYSTEM
 #include <exception>
 #include <typeinfo>
+#ifndef STL_STLPORT
+#include <cxxabi.h>
+#endif
 #ifndef STL_GABI
 #include <iostream>
 #include <string>

Tests/RunCMake/Android/common.cmake

@@ -43,6 +43,8 @@ elseif(CMAKE_ANDROID_STL_TYPE STREQUAL "system")
   add_definitions(-DSTL_SYSTEM)
 elseif(CMAKE_ANDROID_STL_TYPE MATCHES [[^gabi\+\+]])
   add_definitions(-DSTL_GABI)
+elseif(CMAKE_ANDROID_STL_TYPE MATCHES [[^stlport]])
+  add_definitions(-DSTL_STLPORT)
 endif()
 
 string(REPLACE "-" "_" abi "${CMAKE_ANDROID_ARCH_ABI}")