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 21:50:27 +00:00
committed by Gerrit Code Review
parent 5137d4584e 965bfefb6b
commit a82b32a7a7
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/host_test_internal.mk
View File

@@ -5,7 +5,11 @@
LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g 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)),)
LOCAL_STATIC_LIBRARIES += libgtest_libcxx_host libgtest_main_libcxx_host
else
LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
LOCAL_SHARED_LIBRARIES += LOCAL_SHARED_LIBRARIES +=
endif
LOCAL_LDLIBS += -lpthread LOCAL_LDLIBS += -lpthread

4
core/target_test_internal.mk
View File

@@ -5,6 +5,9 @@
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING 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)),)
LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx
else
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
@@ -14,6 +17,7 @@ LOCAL_C_INCLUDES += bionic \
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
LOCAL_STATIC_LIBRARIES += libstdc++ LOCAL_STATIC_LIBRARIES += libstdc++
endif endif
endif
ifndef LOCAL_MODULE_PATH ifndef LOCAL_MODULE_PATH
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)