Remove hard coded gtest/gmock includes/libs. am: c641b5117d
am: 0d57d94734

* commit '0d57d947348dfd819daeacb36c320883e860df43':
  Remove hard coded gtest/gmock includes/libs.

Change-Id: I8a792399a29c4f82ecc37bdba6be0c8788a0547e
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 \