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

Remove support for stlport.

Browse Source 
Test: make checkbuild
Bug: None
Change-Id: Iaaaecbe2608fe7a880236f3bbad0fcfcf62b5096
This commit is contained in:
Dan Albert
2018-01-04 13:34:21 -08:00
parent 94f95cf504
commit 19fbd1ce39
4 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/target_test_internal.mk
View File

@@ -8,13 +8,9 @@ ifeq ($(LOCAL_GTEST),true)
ifndef LOCAL_SDK_VERSION
LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else
ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT)))
my_ndk_gtest_suffix := _c++
else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)
my_ndk_gtest_suffix := _stlport
else # system STL, use stlport
my_ndk_gtest_suffix := _stlport
endif
# TODO(danalbert): Remove the suffix from the module since we only need the
# one variant now.
my_ndk_gtest_suffix := _c++
LOCAL_STATIC_LIBRARIES += \
libgtest_main_ndk$(my_ndk_gtest_suffix) \
libgtest_ndk$(my_ndk_gtest_suffix)