Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91adf75c authored Sep 27, 2014 by Dan Albert Committed by Gerrit Code Review Sep 27, 2014

Merge "Fix detection of C++ STL for tests."

parents 670018fd 683c392e

core/host_test_internal.mk

+8 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,14 @@
		LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g
		LOCAL_C_INCLUDES += external/gtest/include

		ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
		my_test_libcxx := false
		ifeq (,$(TARGET_BUILD_APPS))
		ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
		my_test_libcxx := true
		endif
		endif

		ifeq ($(my_test_libcxx),true)
		LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
		else
		LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host

core/target_test_internal.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES += external/gtest/include
		my_test_libcxx := false
		ifndef LOCAL_SDK_VERSION
		ifeq (,$(TARGET_BUILD_APPS))
		ifeq ($(strip $(LOCAL_CXX_STL)),libc++)
		ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
		my_test_libcxx := true
		endif
		endif