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

Merge "Add support for multiple flavors of the NDK gtest."

Browse source
This commit is contained in:
Dan Albert 2016-03-24 01:26:09 +00:00 committed by Gerrit Code Review
commit cdc8f21180
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/target_test_internal.mk
View file

@ -5,9 +5,20 @@
LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
LOCAL_STATIC_LIBRARIES += libgtest_main libgtest LOCAL_STATIC_LIBRARIES += libgtest_main libgtest
else 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 endif
ifdef LOCAL_MODULE_PATH ifdef LOCAL_MODULE_PATH