From 93766b28ce8ad81bd5a1dd39d7ddd80b65e2a424 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 16 Oct 2014 19:07:41 -0700 Subject: Make libc++ the default STL. Previously, code defaulted to using libstdc++ (which was GNU libstdc++ on the host, or Bionic's "libstdc++" on the target). Now we default to libc++. The exception for this is when using mingw, because we cannot build libc++ for mingw. Change-Id: I68726fa26cdcb6263f17c838d3e859debd57fae1 --- core/target_test_internal.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'core/target_test_internal.mk') diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index 50f4036..ed011d1 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -6,13 +6,12 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_C_INCLUDES += external/gtest/include -my_test_libcxx := false -ifndef LOCAL_SDK_VERSION -ifeq (,$(TARGET_BUILD_APPS)) -ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),) my_test_libcxx := true +ifdef LOCAL_SDK_VERSION +my_test_libcxx := false endif -endif +ifneq ($(filter $(strip $(LOCAL_CXX_STL)),stlport stlport_static),) +my_test_libcxx := false endif ifeq ($(my_test_libcxx),true) -- cgit v1.1