From e5ecdc967dd99fd5137bbfdc95faf1b52e32b86a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 2 Mar 2016 13:05:46 -0800 Subject: [PATCH] Get gtest includes from the exported headers. Change-Id: I47db781a36318664fabff8a5e75031c6bee674e4 --- core/host_test_internal.mk | 1 - core/target_test_internal.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk index 7f6aff0ce..e4fa4c56f 100644 --- a/core/host_test_internal.mk +++ b/core/host_test_internal.mk @@ -9,6 +9,5 @@ LOCAL_CFLAGS_darwin += -DGTEST_OS_LINUX LOCAL_LDLIBS_darwin += -lpthread LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g -LOCAL_C_INCLUDES += external/gtest/include LOCAL_STATIC_LIBRARIES += libgtest_main_host libgtest_host diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index 4715fe8d5..030ca40c3 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -4,8 +4,6 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING -LOCAL_C_INCLUDES += external/gtest/include - ifndef LOCAL_SDK_VERSION LOCAL_STATIC_LIBRARIES += libgtest_main libgtest else