p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Update NDK gtest lib names." 

am: 56c2a18a50

Change-Id: Ib8b6996027020fa8bc1d17f8d1286915c534d94b
This commit is contained in:
Dan Albert 2016-09-12 21:00:26 +00:00 committed by android-build-merger
parent 4b9f214a7b 56c2a18a50
commit 146540b535
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
else
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)),)
my_ndk_gtest_suffix :=
my_ndk_gtest_suffix := _stlport
else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),)
my_ndk_gtest_suffix := _gnustl
else # system STL, use stlport
my_ndk_gtest_suffix :=
my_ndk_gtest_suffix := _stlport
endif
LOCAL_STATIC_LIBRARIES += \
libgtest_main_ndk$(my_ndk_gtest_suffix) \