diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-16 19:07:41 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-07 13:24:56 -0800 |
| commit | 93766b28ce8ad81bd5a1dd39d7ddd80b65e2a424 (patch) | |
| tree | 71f9c1c8707297fa240af39f7f8dbe8ba7f6b496 /core/target_test_internal.mk | |
| parent | 87bde62df4e5bb76f058394cd7fff8eaaf7e0d0c (diff) | |
| download | build-93766b28ce8ad81bd5a1dd39d7ddd80b65e2a424.zip build-93766b28ce8ad81bd5a1dd39d7ddd80b65e2a424.tar.gz build-93766b28ce8ad81bd5a1dd39d7ddd80b65e2a424.tar.bz2 | |
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
Diffstat (limited to 'core/target_test_internal.mk')
| -rw-r--r-- | core/target_test_internal.mk | 9 |
1 files changed, 4 insertions, 5 deletions
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) |