aboutsummaryrefslogtreecommitdiffstats
path: root/core/target_test_internal.mk
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-03-22 17:19:03 -0700
committerDan Albert <danalbert@google.com>2016-03-23 13:25:06 -0700
commitb05cf54432dcbbe0a187fd7e513d5e50071efe05 (patch)
tree11ab7645c5b045b652ab3bf7baab721098435db9 /core/target_test_internal.mk
parent6d41f7e1233da88714edaf3f21f88ff8023558f4 (diff)
downloadbuild_make-b05cf54432dcbbe0a187fd7e513d5e50071efe05.tar.gz
build_make-b05cf54432dcbbe0a187fd7e513d5e50071efe05.tar.bz2
build_make-b05cf54432dcbbe0a187fd7e513d5e50071efe05.zip
Add support for multiple flavors of the NDK gtest.
Since gtest depends on the STL, we need one version for each STL. Bug: http://b/27801981 Change-Id: Id1a5571b043e2513d0184a9ab45a473dd545da84
Diffstat (limited to 'core/target_test_internal.mk')
-rw-r--r--core/target_test_internal.mk15
1 files changed, 13 insertions, 2 deletions
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 030ca40c3e..9e2567433c 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -5,9 +5,20 @@
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
ifndef LOCAL_SDK_VERSION
-LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
+ LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else
-LOCAL_STATIC_LIBRARIES += libgtest_main_ndk libgtest_ndk
+ ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT)))
+ my_ndk_gtest_suffix := _libcxx
+ else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)
+ my_ndk_gtest_suffix :=
+ else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),)
+ my_ndk_gtest_suffix := _gnustl
+ else # system STL, use stlport
+ my_ndk_gtest_suffix :=
+ endif
+ LOCAL_STATIC_LIBRARIES += \
+ libgtest_main_ndk$(my_ndk_gtest_suffix) \
+ libgtest_ndk$(my_ndk_gtest_suffix)
endif
ifdef LOCAL_MODULE_PATH