diff options
| author | Dan Albert <danalbert@google.com> | 2016-08-11 12:35:22 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-08-11 12:35:22 -0700 |
| commit | 581f4d4b27efb0d9c882da66b2ab0126af1288d9 (patch) | |
| tree | 84d79184d9dd2523b415308a10f88421d986b887 | |
| parent | 50cf4188d88e48c2be1eef914bdb5fa7d09557b1 (diff) | |
| download | libweave-581f4d4b27efb0d9c882da66b2ab0126af1288d9.tar.gz | |
Stop hard coding gtest/gmock things.
The headers are exported, and the build system automatically adds
libgtest for test modules.
Test: mma
Bug: None
Change-Id: Ib72c8ae28a62a16f8bc1a0731726d98dc91c0a13
| -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 |