commit c641b5117d9667751ba6f650176adfdcb12ce077
author Dan Albert <danalbert@google.com> Thu Mar 03 11:28:42 2016 -0800
committer Treehugger Robot <treehugger-gerrit@google.com> Wed May 04 20:12:49 2016 +0000
tree 9ddd81d4c5c2938aecf5c00619ce62bb982d60c4
parent 94e850c87e6061a2dec5db6eba125f3cd5ad2a78

Remove hard coded gtest/gmock includes/libs.

Tested that checkbuild passes on volantis.

Bug: http://b/16574165
Change-Id: I7bbbd8b4b926115dec2a90ff36dab32b65a35360

Android.mk

diff --git a/Android.mk b/Android.mk
index cc45ffa..cf162b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,6 @@
 buffetCommonCIncludes := \
 	$(LOCAL_PATH)/.. \
 	external/cros/system_api \
-	external/gtest/include \
 
 buffetSharedLibraries := \
 	libapmanager-client \
@@ -153,7 +152,6 @@
 LOCAL_CPP_EXTENSION := $(buffetCommonCppExtension)
 LOCAL_CFLAGS := $(buffetCommonCFlags)
 LOCAL_CPPFLAGS := $(buffetCommonCppFlags)
-LOCAL_C_INCLUDES := external/gtest/include
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := \
 	libbinder \
@@ -184,7 +182,6 @@
 LOCAL_CPPFLAGS := $(buffetCommonCppFlags)
 LOCAL_C_INCLUDES := \
 	$(buffetCommonCIncludes) \
-	external/gmock/include \
 
 LOCAL_SHARED_LIBRARIES := \
 	$(buffetSharedLibraries) \
@@ -192,7 +189,6 @@
 LOCAL_STATIC_LIBRARIES := \
 	libbrillo-test-helpers \
 	libchrome_test_helpers \
-	libgtest \
 	libgmock \
 	libweave-test \
 	weave-daemon-common \