diff options
| author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 06:16:23 +0000 |
|---|---|---|
| committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 06:16:23 +0000 |
| commit | b0ebbcb02cbe7a2b705f48a8e398f2418dcc85b5 (patch) | |
| tree | 5b2fd1655ad1404899d206eecc1aeb9637c9d20a | |
| parent | 3edef215ea8a3064d24a04f1cb16c7f02dcbe127 (diff) | |
| download | chromium_src-b0ebbcb02cbe7a2b705f48a8e398f2418dcc85b5.zip chromium_src-b0ebbcb02cbe7a2b705f48a8e398f2418dcc85b5.tar.gz chromium_src-b0ebbcb02cbe7a2b705f48a8e398f2418dcc85b5.tar.bz2 | |
Roll third_party/cacheinvalidation r221:r245
This is a retry of http://crrev.com/164259, reverted by
http://crrev.com/164266 by failing checklicenses.py.
The intention of this roll is to add 2 source types in
proto (COSMO_CHANGELOG and CHROME_PUSH_MESSAGING) in r241,
but also includes the v2 of the Android client library (r221:240).
r241 had an Android build issue (a symbol "ANDROID" was
defined as an enum member in proto, which was blown away
by -DANDROID compiler option, introduced at r239), and
r242 reverted it.
r243 fixed the checklicenses.py issue by adding a proper
license in src/example-app-build/generate_protos.sh.
r244:
Track changes from HEAD. In particular, ensure that all code builds against the
open-sourced protocol buffers library.
r245:
Add missing TrickleState.
BUG=150005, 157546
TEST=compile succeeds.
Review URL: https://chromiumcodereview.appspot.com/11304005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165113 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/README.chromium | 2 |
3 files changed, 2 insertions, 3 deletions
@@ -153,7 +153,6 @@ v8.log /third_party/asan /third_party/bidichecker /third_party/bison -/third_party/cacheinvalidation/files /third_party/cacheinvalidation/src /third_party/chromeos_login_manager /third_party/chromeos_text_input @@ -91,7 +91,7 @@ deps = { "src/third_party/cacheinvalidation/src": (Var("googlecode_url") % "google-cache-invalidation-api") + - "/trunk/src@220", + "/trunk/src@245", "src/third_party/leveldatabase/src": (Var("googlecode_url") % "leveldb") + "/trunk@68", diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium index ad5d645..09f413e 100644 --- a/third_party/cacheinvalidation/README.chromium +++ b/third_party/cacheinvalidation/README.chromium @@ -1,7 +1,7 @@ Name: Google Cache Invalidation API Short Name: google-cache-invalidation-api URL: http://code.google.com/p/google-cache-invalidation-api/ -Version: r220 +Version: r245 License: Apache 2.0 License File: src/google/cacheinvalidation/COPYING Security Critical: no |