6 files changed, 15 insertions, 1 deletions
diff --git a/Tests/RunCMake/Android/android.cxx b/Tests/RunCMake/Android/android.cxx
index e6a6cda..2dee8f9 100644
--- a/Tests/RunCMake/Android/android.cxx
+++ b/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>
diff --git a/Tests/RunCMake/Android/common.cmake b/Tests/RunCMake/Android/common.cmake
index 6ea0909..d803c98 100644
--- a/Tests/RunCMake/Android/common.cmake
+++ b/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}")
diff --git a/Tests/RunCMake/AndroidMK/AndroidMK.cmake b/Tests/RunCMake/AndroidMK/AndroidMK.cmake
index ed21e58..2596e8c 100644
--- a/Tests/RunCMake/AndroidMK/AndroidMK.cmake
+++ b/Tests/RunCMake/AndroidMK/AndroidMK.cmake
@@ -2,7 +2,7 @@ project(build)
 set(CMAKE_BUILD_TYPE Debug)
 add_library(foo foo.cxx)
 add_library(car foo.cxx)
-add_library(bar  foo.cxx)
+add_library(bar bar.c)
 add_library(dog  foo.cxx)
 target_link_libraries(foo car bar dog debug -lm)
 export(TARGETS bar dog car foo  ANDROID_MK
diff --git a/Tests/RunCMake/AndroidMK/bar.c b/Tests/RunCMake/AndroidMK/bar.c
new file mode 100644
index 0000000..e1f4df6
--- /dev/null
+++ b/Tests/RunCMake/AndroidMK/bar.c
@@ -0,0 +1,3 @@
+void bar(void)
+{
+}
diff --git a/Tests/RunCMake/AndroidMK/expectedBuildAndroidMK.txt b/Tests/RunCMake/AndroidMK/expectedBuildAndroidMK.txt
index def8fcb..bbf67a5 100644
--- a/Tests/RunCMake/AndroidMK/expectedBuildAndroidMK.txt
+++ b/Tests/RunCMake/AndroidMK/expectedBuildAndroidMK.txt
@@ -7,11 +7,13 @@ include.*PREBUILT_STATIC_LIBRARY.*
 include.*CLEAR_VARS.*
 LOCAL_MODULE.*dog
 LOCAL_SRC_FILES.*.*dog.*
+LOCAL_HAS_CPP := true
 include.*PREBUILT_STATIC_LIBRARY.*
 .*
 include.*CLEAR_VARS.*
 LOCAL_MODULE.*car
 LOCAL_SRC_FILES.*.*car.*
+LOCAL_HAS_CPP := true
 include.*PREBUILT_STATIC_LIBRARY.*
 .*
 include.*CLEAR_VARS.*
@@ -20,4 +22,5 @@ LOCAL_SRC_FILES.*.*foo.*
 LOCAL_CPP_FEATURES.*rtti exceptions
 LOCAL_STATIC_LIBRARIES.*car bar dog
 LOCAL_EXPORT_LDLIBS := -lm
+LOCAL_HAS_CPP := true
 include.*PREBUILT_STATIC_LIBRARY.*
diff --git a/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt b/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt
index 1bdb308..3515fb9 100644
--- a/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt
+++ b/Tests/RunCMake/AndroidMK/expectedInstallAndroidMK.txt
@@ -9,11 +9,13 @@ include.*PREBUILT_STATIC_LIBRARY.*
 include.*CLEAR_VARS.
 LOCAL_MODULE.*dog
 LOCAL_SRC_FILES.*_IMPORT_PREFIX./lib.*dog.*
+LOCAL_HAS_CPP := true
 include.*PREBUILT_STATIC_LIBRARY.*
 
 include.*CLEAR_VARS.*
 LOCAL_MODULE.*car
 LOCAL_SRC_FILES.*_IMPORT_PREFIX./lib.*car.*
+LOCAL_HAS_CPP := true
 include.*PREBUILT_STATIC_LIBRARY.*
 
 include.*CLEAR_VARS.*
@@ -22,4 +24,5 @@ LOCAL_SRC_FILES.*_IMPORT_PREFIX\)/lib.*foo.*
 LOCAL_CPP_FEATURES.*rtti exceptions
 LOCAL_STATIC_LIBRARIES.*car bar dog
 LOCAL_EXPORT_LDLIBS := -lm
+LOCAL_HAS_CPP := true
 include.*PREBUILT_STATIC_LIBRARY.*