commit d5419299da83b0ffd5b31181e263325ed36cec06
author Dan Albert <danalbert@google.com> Fri Aug 12 09:28:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 09:28:26 2016 +0000
tree 84d79184d9dd2523b415308a10f88421d986b887
parent 6125590925677a6fc09007d835616ba59044885d
parent d4eabd105d038610c2722f8e6bdff5f5428265c0

Stop hard coding gtest/gmock things. am: 581f4d4b27
am: d4eabd105d

Change-Id: Ic236c62ed98e857cfa666bdf159049f7b48f7379

Android.mk

diff --git a/Android.mk b/Android.mk
index a72c61c..90a2a80 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,6 @@
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/third_party/modp_b64/modp_b64 \
 	$(LOCAL_PATH)/third_party/libuweave \
-	external/gtest/include \
 
 libweaveSharedLibraries := \
 	libchrome \
@@ -83,7 +82,6 @@
 LOCAL_CPPFLAGS := $(libweaveCommonCppFlags)
 LOCAL_C_INCLUDES := \
 	$(libweaveCommonCIncludes) \
-	external/gmock/include \
 
 LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries)
 LOCAL_STATIC_LIBRARIES := libgtest libgmock
@@ -121,7 +119,6 @@
 LOCAL_CPPFLAGS := $(libweaveCommonCppFlags)
 LOCAL_C_INCLUDES := \
 	$(libweaveCommonCIncludes) \
-	external/gmock/include \
 
 LOCAL_SHARED_LIBRARIES := \
 	$(libweaveSharedLibraries) \
@@ -130,7 +127,7 @@
 	libweave-common \
 	libweave-external \
 	libweave-test \
-	libgtest libgmock \
+	libgmock \
 	libchrome_test_helpers \
 
 LOCAL_CLANG := true