diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2016-01-19 16:37:59 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2016-01-19 16:37:59 -0800 |
| commit | 6741755651fc918a63beb2a6627f8a54c636afb1 (patch) | |
| tree | 2a75e6193233c1cfb1c8fdf491173f46743cec7f | |
| parent | 42e508f2559e019d2fcc8f88adfd184b7a6bc3a4 (diff) | |
| parent | c08442f363b23073608af7856ddbdb3ea60a6f37 (diff) | |
| download | libweave-6741755651fc918a63beb2a6627f8a54c636afb1.tar.gz | |
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
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/privet/security_manager.cc | 3 | ||||
| -rw-r--r-- | third_party/third_party.mk | 6 |
4 files changed, 10 insertions, 4 deletions
@@ -84,7 +84,8 @@ include file_lists.mk third_party/third_party.mk examples/examples.mk tests.mk 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 $@ $< @@ -99,7 +99,7 @@ make out/Debug/libweave.so ### 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 @@ bool SecurityManager::CreateAccessToken(AuthType auth_type, 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_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 $@ $< |