aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-08-12 09:31:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-12 09:31:57 +0000
commitc1e1a97bd58d7409e9125d2611342c23aa762666 (patch)
tree84d79184d9dd2523b415308a10f88421d986b887
parent2c02e87003d7aa12fb2e33e99dd0208d875485bd (diff)
parentd5419299da83b0ffd5b31181e263325ed36cec06 (diff)
downloadlibweave-master.tar.gz
am: d5419299da Change-Id: I63492bab84e565236ce54e61b8e3957877974b31
-rw-r--r--Android.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index a72c61c..90a2a80 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,6 @@ libweaveCommonCIncludes := \
$(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_CFLAGS := $(libweaveCommonCFlags)
LOCAL_CPPFLAGS := $(libweaveCommonCppFlags)
LOCAL_C_INCLUDES := \
$(libweaveCommonCIncludes) \
- external/gmock/include \
LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries)
LOCAL_STATIC_LIBRARIES := libgtest libgmock
@@ -121,7 +119,6 @@ LOCAL_CFLAGS := $(libweaveCommonCFlags)
LOCAL_CPPFLAGS := $(libweaveCommonCppFlags)
LOCAL_C_INCLUDES := \
$(libweaveCommonCIncludes) \
- external/gmock/include \
LOCAL_SHARED_LIBRARIES := \
$(libweaveSharedLibraries) \
@@ -130,7 +127,7 @@ LOCAL_STATIC_LIBRARIES := \
libweave-common \
libweave-external \
libweave-test \
- libgtest libgmock \
+ libgmock \
libchrome_test_helpers \
LOCAL_CLANG := true