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>
diff --git a/Makefile b/Makefile index d08be68..ebc8c4c 100644 --- a/Makefile +++ b/Makefile
@@ -84,7 +84,8 @@ weave_obj_files := $(WEAVE_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) -$(weave_obj_files) : out/$(BUILD_MODE)/%.o : %.cc +# TODO(jacobmarble): There are too many libgtest.a deps in non-test targets. Fix. +$(weave_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 $@ $<
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_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 $@ $<