Use libc++ for bionic tests.
Change-Id: Ie8933ef25b25d353243f74799c507dcd25195414
diff --git a/build/test_executable.mk b/build/test_executable.mk
index 59ca486..b821d34 100644
--- a/build/test_executable.mk
+++ b/build/test_executable.mk
@@ -23,7 +23,12 @@
# as needed by CTS.
#
+ifneq ($(filter $(LOCAL_CXX_STL),libc++ libc++_static),)
+LOCAL_CXX_STL := libc++
+else
LOCAL_CXX_STL := stlport
+endif
+
include $(BUILD_EXECUTABLE)
cts_executable_xml := $(CTS_TESTCASES_OUT)/$(LOCAL_MODULE).xml
diff --git a/tests/tests/bionic/Android.mk b/tests/tests/bionic/Android.mk
index f776827..fe56b05 100644
--- a/tests/tests/bionic/Android.mk
+++ b/tests/tests/bionic/Android.mk
@@ -19,10 +19,10 @@
LOCAL_STATIC_LIBRARIES += \
libtinyxml2 \
liblog \
- libgtest \
- libgtest_main \
+ libgtest_libc++ \
+ libgtest_main_libc++ \
-LOCAL_CXX_STL := stlport
+LOCAL_CXX_STL := libc++
LOCAL_CTS_TEST_PACKAGE := android.bionic
include $(BUILD_CTS_EXECUTABLE)
@@ -44,5 +44,7 @@
LOCAL_WHOLE_STATIC_LIBRARIES += \
libBionicTests \
+LOCAL_CXX_STL := libc++
+
include $(BUILD_HOST_NATIVE_TEST)
endif # ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))