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

Merge "Update NDK gtest lib names."

Browse Source
This commit is contained in:
Treehugger Robot
2016-09-12 20:48:42 +00:00
committed by Gerrit Code Review
parent f9d5fb97cb f5d024d31a
commit 56c2a18a50
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/target_test_internal.mk
View File

@@ -8,13 +8,13 @@ ifndef LOCAL_SDK_VERSION
LOCAL_STATIC_LIBRARIES += libgtest_main libgtest LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else else
ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT))) ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT)))
my_ndk_gtest_suffix := _libcxx my_ndk_gtest_suffix := _c++
else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),) else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)
my_ndk_gtest_suffix := my_ndk_gtest_suffix := _stlport
else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),) else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),)
my_ndk_gtest_suffix := _gnustl my_ndk_gtest_suffix := _gnustl
else # system STL, use stlport else # system STL, use stlport
my_ndk_gtest_suffix := my_ndk_gtest_suffix := _stlport
endif endif
LOCAL_STATIC_LIBRARIES += \ LOCAL_STATIC_LIBRARIES += \
libgtest_main_ndk$(my_ndk_gtest_suffix) \ libgtest_main_ndk$(my_ndk_gtest_suffix) \