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

Commit a82b32a7 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 5137d458 965bfefb

core/host_test_internal.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,7 +5,11 @@
		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
		else
		LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
		LOCAL_SHARED_LIBRARIES +=
		endif

		LOCAL_LDLIBS += -lpthread

core/target_test_internal.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@
		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
		else
		LOCAL_STATIC_LIBRARIES += libgtest libgtest_main

		ifndef LOCAL_SDK_VERSION
		@@ -14,6 +17,7 @@ LOCAL_C_INCLUDES += bionic \
		LOCAL_SHARED_LIBRARIES += libstlport
		LOCAL_STATIC_LIBRARIES += libstdc++
		endif
		endif

		ifndef LOCAL_MODULE_PATH
		LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)