Commit 9bd3318e authored by pavely@chromium.org's avatar pavely@chromium.org

Roll cacheinvalidation DEPS to r330

Changes are needed for GCM for Chrome on desktop.

Full list of changes:

322: Cleanup: Convert from scoped_ptr to std::unique_ptr.
323: remove unused mock methods
324: Add channel_common.proto
325: Revert r322 since Chrome does not yet support unique_ptr
326: update build datestamp
327: February 2014 invalidation client release
328: Adding copies of protos for use in C++ cache invalidation.
329: change protocol buffer compiler options in channel_common.proto
330: add lite runtime option to android_channel.proto

BUG=325020
R=meek@chromium.org

Review URL: https://codereview.chromium.org/185013002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255300 0039d316-1c4b-4281-b951-d872f2087c98
parent a5243f73
......@@ -116,7 +116,7 @@ deps = {
"src/third_party/cacheinvalidation/src":
(Var("googlecode_url") % "google-cache-invalidation-api") +
"/trunk/src@321",
"/trunk/src@330",
"src/third_party/leveldatabase/src":
(Var("googlecode_url") % "leveldb") + "/trunk@79",
......
Name: Google Cache Invalidation API
Short Name: google-cache-invalidation-api
URL: http://code.google.com/p/google-cache-invalidation-api/
Version: r307
Version: r330
License: Apache 2.0
License File: src/google/cacheinvalidation/COPYING
Security Critical: no
......
......@@ -24,6 +24,8 @@
'proto_out_dir': '<(proto_dir_relpath)',
},
'sources': [
'<(proto_in_dir)/android_channel.proto',
'<(proto_in_dir)/channel_common.proto',
'<(proto_in_dir)/client.proto',
'<(proto_in_dir)/client_gateway.proto',
'<(proto_in_dir)/client_protocol.proto',
......@@ -38,6 +40,17 @@
},
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
# channel_common.proto contains definition of ANDROID constant which on
# android build conflicts with compiler option -DANDROID. Remove protos
# from android build.
'conditions': [
['OS=="android"', {
'sources!': [
'<(proto_in_dir)/android_channel.proto',
'<(proto_in_dir)/channel_common.proto',
],
}],
],
},
# The main cache invalidation library. External clients should depend
# only on this.
......@@ -193,7 +206,6 @@
'<(proto_in_dir)/android_listener.proto',
'<(proto_in_dir)/android_service.proto',
'<(proto_in_dir)/android_state.proto',
'<(proto_in_dir)/channel.proto',
'<(proto_in_dir)/channel_common.proto',
'<(proto_in_dir)/client.proto',
'<(proto_in_dir)/client_protocol.proto',
......@@ -202,6 +214,18 @@
],
'includes': [ '../../build/protoc_java.gypi' ],
},
{
'target_name': 'cacheinvalidation_example_proto_java',
'type': 'none',
'variables': {
'cacheinvalidation_in_dir': '../../third_party/cacheinvalidation/src',
'proto_in_dir' : '<(cacheinvalidation_in_dir)/java/com/google/ipc/invalidation/examples/android2',
},
'sources': [
'<(proto_in_dir)/example_listener.proto',
],
'includes': [ '../../build/protoc_java.gypi' ],
},
{
'target_name': 'cacheinvalidation_javalib',
'type': 'none',
......@@ -209,6 +233,7 @@
'../../third_party/android_tools/android_tools.gyp:android_gcm',
'../../third_party/guava/guava.gyp:guava_javalib',
'cacheinvalidation_aidl_javalib',
'cacheinvalidation_example_proto_java',
'cacheinvalidation_proto_java',
],
'variables': {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment