StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use libc++ versions of gtest libs when needed"

Browse Source
This commit is contained in:
Dan Albert
2014-05-16 22:02:11 +00:00
committed by Gerrit Code Review
parent a82b32a7a7 9b0c6ff69c
commit b589679b10
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_test_internal.mk
View File

@@ -6,7 +6,7 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_C_INCLUDES += external/gtest/include LOCAL_C_INCLUDES += external/gtest/include
ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),) ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
LOCAL_STATIC_LIBRARIES += libgtest_libcxx_host libgtest_main_libcxx_host LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
else else
LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
LOCAL_SHARED_LIBRARIES += LOCAL_SHARED_LIBRARIES +=

2
core/target_test_internal.mk
View File

@@ -6,7 +6,7 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
LOCAL_C_INCLUDES += external/gtest/include LOCAL_C_INCLUDES += external/gtest/include
ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),) ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++
else else
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main LOCAL_STATIC_LIBRARIES += libgtest libgtest_main