commit 728b27abf3c17cea3350a969d818b3d13d4604d4
author Dan Albert <danalbert@google.com> Thu Sep 08 23:01:12 2016 -0700
committer Dan Albert <danalbert@google.com> Fri Sep 09 00:40:57 2016 -0700
tree 380e7fba942f2d309af901f0ba97413824bc86ee
parent 3bac5443975cd6312e7c6282b94014db25f369d7

Stop manually including gtest headers.

libgtest exports these.

Test: mm
Bug: http://b/16574165
Change-Id: I4f6220c6d3fe67f4a21451d2f7e790705519d935

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 630cf3c..4be43ec 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -140,7 +140,6 @@
     },
 
     include_dirs: [
-        "external/gtest/include",
         "external/icu/icu4c/source/common",
         "external/lz4/lib",
         "external/valgrind/include",

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 04a0344..2e1434b 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -87,7 +87,6 @@
 ART_CPP_EXTENSION := .cc
 
 ART_C_INCLUDES := \
-  external/gtest/include \
   external/icu/icu4c/source/common \
   external/lz4/lib \
   external/valgrind/include \

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index c09241a..0340e10 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -634,6 +634,7 @@
   LOCAL_SRC_FILES := $$(art_gtest_filename)
   LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) art/runtime art/cmdline $$(art_gtest_extra_c_includes)
   LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libartd-disassembler
+  LOCAL_STATIC_LIBRARIES += libgtest
   LOCAL_WHOLE_STATIC_LIBRARIES += libsigchain
 
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk