diff options
| author | Jacob Marble <jacobmarble@google.com> | 2016-01-15 17:08:17 -0800 |
|---|---|---|
| committer | Jacob Marble <jacobmarble@google.com> | 2016-01-19 16:14:17 +0000 |
| commit | c08442f363b23073608af7856ddbdb3ea60a6f37 (patch) | |
| tree | 619bf0a1ad252be4e29ac47d01bd64d78adab786 /third_party | |
| parent | 36fd44f67b5c98d9a262ad7c7fafc0cf53964a4c (diff) | |
| download | libweave-c08442f363b23073608af7856ddbdb3ea60a6f37.tar.gz | |
libweave: Add libgtest.a dependencies to Makefiles
This is a band-aid. libweave.so and other non-test targets should not
require gtest.
BUG: 26564098
Change-Id: I7691250c2551b44ec64f3867e0d8238520173253
Reviewed-on: https://weave-review.googlesource.com/2202
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/third_party.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/third_party.mk b/third_party/third_party.mk index 638d8a7..91e4cf4 100644 --- a/third_party/third_party.mk +++ b/third_party/third_party.mk @@ -7,7 +7,8 @@ third_party_chromium_base_obj_files := $(THIRD_PARTY_CHROMIUM_BASE_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) -$(third_party_chromium_base_obj_files) : out/$(BUILD_MODE)/%.o : %.cc +# We don't need libgtest.a, but the headers files in third_party/include. +$(third_party_chromium_base_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/lib/libgtest.a mkdir -p $(dir $@) $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< @@ -20,7 +21,8 @@ $(third_party_chromium_base_unittest_obj_files) : out/$(BUILD_MODE)/%.o : %.cc t third_party_chromium_crypto_obj_files := $(THIRD_PARTY_CHROMIUM_CRYPTO_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) -$(third_party_chromium_crypto_obj_files) : out/$(BUILD_MODE)/%.o : %.cc +# We don't need libgtest.a, but the headers files in third_party/include. +$(third_party_chromium_crypto_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/lib/libgtest.a mkdir -p $(dir $@) $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< |