tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update NDK gtest lib names." am: 56c2a18a50 am: 146540b535

Browse source 
am: 5eb8f65378

Change-Id: If949af2958f4cf844b844f69e1311bcb9ab6b4fe
This commit is contained in:
Dan Albert 2016-09-12 21:24:56 +00:00 committed by android-build-merger
commit 45fe3712fc
1 changed files with 3 additions and 3 deletions
Show stats 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) \