commit f8b170dc52575f16a63bfd6b6710efb46580c8b2
author Dan Albert <danalbert@google.com> Fri Mar 04 22:30:58 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 22:30:58 2016 +0000
tree dd6dd2f368d3424b92dcfee28f119d7c5ac198c6
parent dfa0d1063a8b07c22d79116be799ffda537211e8
parent e5ecdc967dd99fd5137bbfdc95faf1b52e32b86a

Merge "Get gtest includes from the exported headers."

core/host_test_internal.mk

diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk
index 7f6aff0..e4fa4c5 100644
--- a/core/host_test_internal.mk
+++ b/core/host_test_internal.mk
@@ -9,6 +9,5 @@
 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

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 4715fe8..030ca40 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