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

am fb5f4177: Merge "Remove logic for libstdc++ gtest libs."

Browse Source 
* commit 'fb5f41779e67e5d98587f7e1348cae2cf45e719c':
  Remove logic for libstdc++ gtest libs.
This commit is contained in:
Dan Albert
2014-11-10 22:19:13 +00:00
committed by Android Git Automerger
parent 65f5175f06 fb5f41779e
commit 8338cb6820
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/host_test_internal.mk
View File

@@ -12,17 +12,4 @@ endif
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_C_INCLUDES += external/gtest/include
my_test_libcxx := true
ifeq (,$(TARGET_BUILD_APPS))
ifneq ($(filter $(strip $(LOCAL_CXX_STL)),bionic stlport stlport_static),)
my_test_libcxx := false
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
LOCAL_SHARED_LIBRARIES +=
endif