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

am 71b0d7b2: am 8df7653d: Merge "Remove logic for platform stlport gtest."

Browse Source 
* commit '71b0d7b25065b2be35248380c3b98b0f77d27bd6':
  Remove logic for platform stlport gtest.
This commit is contained in:
Dan Albert
2014-11-15 23:54:24 +00:00
committed by Android Git Automerger
parent d46dc4535f 71b0d7b250
commit 7d9b27c593
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/target_test_internal.mk
View File

@@ -6,25 +6,10 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
LOCAL_C_INCLUDES += external/gtest/include LOCAL_C_INCLUDES += external/gtest/include
my_test_libcxx := true
ifdef LOCAL_SDK_VERSION
my_test_libcxx := false
endif
ifneq ($(filter $(strip $(LOCAL_CXX_STL)),stlport stlport_static),)
my_test_libcxx := false
endif
ifeq ($(my_test_libcxx),true)
LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++
else
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
LOCAL_C_INCLUDES += bionic \ LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
bionic/libstdc++/include \ else
external/stlport/stlport LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk
LOCAL_SHARED_LIBRARIES += libstlport libstdc++
endif
endif endif
ifdef LOCAL_MODULE_PATH ifdef LOCAL_MODULE_PATH