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

Commit b589679b authored May 16, 2014 by Dan Albert Committed by Gerrit Code Review May 16, 2014

Merge "Use libc++ versions of gtest libs when needed"

parents a82b32a7 9b0c6ff6

core/host_test_internal.mk

+1 −1

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

		ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
		LOCAL_STATIC_LIBRARIES += libgtest_libcxx_host libgtest_main_libcxx_host
		LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
		else
		LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
		LOCAL_SHARED_LIBRARIES +=

core/target_test_internal.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING

		LOCAL_C_INCLUDES += external/gtest/include
		ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
		LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx
		LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++
		else
		LOCAL_STATIC_LIBRARIES += libgtest libgtest_main