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

Update NDK gtest lib names.

Browse Source 
The NDK gtest libs are always suffixed to simplify the make macro
that generates the test modules.

Bug: http://b/16574165
Change-Id: I1c9647e90aff2f1e9da4a88cad30199b1e423757
This commit is contained in:
Dan Albert
2016-04-26 14:18:01 -07:00
parent 6b363e24bd
commit f5d024d31a
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
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) \