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

Merge "Remove logic for platform stlport gtest."

This commit is contained in:
Dan Albert 2014-11-15 23:42:15 +00:00 committed by Gerrit Code Review
parent 5520d930c8 8914f71cc0
commit 8df7653d56
1 changed files with 3 additions and 18 deletions
Show Stats 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
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
LOCAL_C_INCLUDES += bionic \
bionic/libstdc++/include \
external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport libstdc++
endif
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
else
LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk
endif
ifdef LOCAL_MODULE_PATH