From 9b0c6ff69c7f80fd1fd0346c7840a0ca3e640a75 Mon Sep 17 00:00:00 2001 From: Dan Albert <danalbert@google.com> Date: Wed, 14 May 2014 14:16:47 -0700 Subject: [PATCH] Use libc++ versions of gtest libs when needed Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45 --- core/host_test_internal.mk | 2 +- core/target_test_internal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk index c2c318656..426c400ad 100644 --- a/core/host_test_internal.mk +++ b/core/host_test_internal.mk @@ -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 += diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index 60a7c9efa..49ea518cf 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -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