diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 21:18:27 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 21:18:27 +0000 |
| commit | 0df33079424e191c9a1e77e5fbd2d2d94c634d53 (patch) | |
| tree | 6510af0e0cf47c918555f80b40b7907169df612f /third_party/cacheinvalidation | |
| parent | fa8220bb76bea14efd53d3d4ac43804ed04f7b02 (diff) | |
| download | chromium_src-0df33079424e191c9a1e77e5fbd2d2d94c634d53.zip chromium_src-0df33079424e191c9a1e77e5fbd2d2d94c634d53.tar.gz chromium_src-0df33079424e191c9a1e77e5fbd2d2d94c634d53.tar.bz2 | |
[sync] Componentize sync: Part 3: Roll version of third_party/cacheinvalidation in DEPS
In order to support component builds, a few fixes had to be made upstream in third_party/cacheinvalidation. See https://codereview.chromium.org/11464039.
This patch does the following:
- Rolls the version of third_party/cacheinvalidation in chromium's DEPS file to r247, which includes the fixes.
- Fixes cacheinvalidation.gyp to include a new proto file added in r246.
- Adds documentation to help detect build breaks due to future version rolls.
r246: Simplified AndroidListener abstraction.
r247: Remove references to (unused) headers and types not available in protobuf_lite runtime.
BUG=136928
Review URL: https://codereview.chromium.org/11552032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/cacheinvalidation')
| -rw-r--r-- | third_party/cacheinvalidation/README.chromium | 13 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium index 09f413e..836451e 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: r245 +Version: r247 License: Apache 2.0 License File: src/google/cacheinvalidation/COPYING Security Critical: no @@ -11,3 +11,14 @@ This is the API to talk to the Google Cache Invalidation service. Local Modifications: None. + +Note: If you are rolling forward the Cache Invalidation API version, and want to +check if any changes need to be made to cacheinvalidation.gyp, do the following: + + cd src/third_party/cacheinvalidation/src + git remote update + git diff --diff-filter=ACDR --name-only origin/master | grep -v ^java/ + +This should give you a list of relevant files that were added, copied, renamed +or deleted upstream. You will likely need to make appropriate changes to +cacheinvalidation.gyp to keep the build green. diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index c722dc5..9d4b9eb 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -179,6 +179,7 @@ }, 'sources': [ '<(proto_in_dir)/android_channel.proto', + '<(proto_in_dir)/android_listener.proto', '<(proto_in_dir)/android_service.proto', '<(proto_in_dir)/android_state.proto', '<(proto_in_dir)/channel.proto', |