Merge remote-tracking branch 'weave/master' into dev_dev2
* weave/master:
libweave: Add libgtest.a dependencies to Makefiles
Fix assigning error in SecurityManager
README: fix typo in examples rule
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/README.md b/README.md
index 5f69b01..fc042b7 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@
### Build examples
```
-make examples-all
+make all-examples
```
See [the examples README](/examples/daemon/README.md) for details.
diff --git a/src/privet/security_manager.cc b/src/privet/security_manager.cc
index 4cd9276..2a3dc08 100644
--- a/src/privet/security_manager.cc
+++ b/src/privet/security_manager.cc
@@ -185,6 +185,9 @@
std::vector<uint8_t> auth_decoded;
if (auth_type != AuthType::kAnonymous &&
!Base64Decode(auth_code, &auth_decoded)) {
+ Error::AddToPrintf(error, FROM_HERE, errors::kDomain,
+ errors::kInvalidAuthorization,
+ "Invalid auth_code encoding: %s", auth_code.c_str());
return false;
}
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 $@ $<
