diff options
author | Dan Albert <danalbert@google.com> | 2016-08-12 09:31:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 09:31:57 +0000 |
commit | c1e1a97bd58d7409e9125d2611342c23aa762666 (patch) | |
tree | 84d79184d9dd2523b415308a10f88421d986b887 | |
parent | 2c02e87003d7aa12fb2e33e99dd0208d875485bd (diff) | |
parent | d5419299da83b0ffd5b31181e263325ed36cec06 (diff) | |
download | libweave-o-mr1-iot-preview-6.tar.gz |
Stop hard coding gtest/gmock things. am: 581f4d4b27 am: d4eabd105dHEADandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-mr1-iot-preview-6android-o-iot-preview-5android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4sdk-releaseo-previewo-mr1-iot-preview-6o-iot-preview-5nougat-iot-releasen-iot-preview-4mastermain
am: d5419299da
Change-Id: I63492bab84e565236ce54e61b8e3957877974b31
-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 |