openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am ec8815f9: am 91adf75c: Merge "Fix detection of C++ STL for tests." 

* commit 'ec8815f96cb0c8c42e59b20c6c29ef91e9b338a1':
  Fix detection of C++ STL for tests.
This commit is contained in:
Dan Albert 2014-09-27 00:12:22 +00:00 committed by Android Git Automerger
parent 583ec9da3e ec8815f96c
commit 93785e2793
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/host_test_internal.mk
View File

@ -5,7 +5,14 @@
LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_C_INCLUDES += external/gtest/include
ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
my_test_libcxx := false
ifeq (,$(TARGET_BUILD_APPS))
ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
my_test_libcxx := true
endif
endif
ifeq ($(my_test_libcxx),true)
LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
else
LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host

2
core/target_test_internal.mk
View File

@ -9,7 +9,7 @@ LOCAL_C_INCLUDES += external/gtest/include
my_test_libcxx := false
ifndef LOCAL_SDK_VERSION
ifeq (,$(TARGET_BUILD_APPS))
ifeq ($(strip $(LOCAL_CXX_STL)),libc++)
ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
my_test_libcxx := true
endif
endif