summaryrefslogtreecommitdiffstats
path: root/third_party/cacheinvalidation
diff options
context:
space:
mode:
authorkochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-31 06:16:23 +0000
committerkochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-31 06:16:23 +0000
commitb0ebbcb02cbe7a2b705f48a8e398f2418dcc85b5 (patch)
tree5b2fd1655ad1404899d206eecc1aeb9637c9d20a /third_party/cacheinvalidation
parent3edef215ea8a3064d24a04f1cb16c7f02dcbe127 (diff)
downloadchromium_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
Diffstat (limited to 'third_party/cacheinvalidation')
-rw-r--r--third_party/cacheinvalidation/README.chromium2
1 files changed, 1 insertions, 1 deletions
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