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

Remove logic for platform stlport gtest. 

Now that the platforms stlport linked gtest is gone, we don't need the
logic for this any more. All platform tests will use libc++ (which has
been renamed to libgtest without a suffix).

Note that tests built with the NDK will still use stlport, but they
will use the NDK's stlport, not the platform's.

Bug: 15193147
Change-Id: Ifcb2489ed60c41e4ed028096b516c1ee643de907
This commit is contained in:
Dan Albert 2014-11-11 16:19:59 -08:00
parent 201f6b3e92
commit 8914f71cc0
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