diff options
| author | Dan Albert <danalbert@google.com> | 2016-08-12 09:28:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 09:28:26 +0000 |
| commit | d5419299da83b0ffd5b31181e263325ed36cec06 (patch) | |
| tree | 84d79184d9dd2523b415308a10f88421d986b887 | |
| parent | 6125590925677a6fc09007d835616ba59044885d (diff) | |
| parent | d4eabd105d038610c2722f8e6bdff5f5428265c0 (diff) | |
| download | libweave-d5419299da83b0ffd5b31181e263325ed36cec06.tar.gz | |
Stop hard coding gtest/gmock things. am: 581f4d4b27
am: d4eabd105d
Change-Id: Ic236c62ed98e857cfa666bdf159049f7b48f7379
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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 |