Roll cacheinvalidation DEPS to r330

third_party/cacheinvalidation/cacheinvalidation.gyp

Index: third_party/cacheinvalidation/cacheinvalidation.gyp
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 5a38bb2d6934c667eaf16e9d0c2d5f4c4b3d5936..aaeec67c14521051133268f701f703778a96dc88 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -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 ANDRIOD constant which on 

[rlarocque, 2014/03/05 01:05:22]

typo: ANDRIOD (and below)

[pavely, 2014/03/05 17:34:29]

Done.

+      # android build conflicts with compiler option -DANDRIOD. Remove protos
+      # from android build.
+      'conditions': [
+        ['OS=="android"', {
+          'sources!': [

[rlarocque, 2014/03/05 01:05:22]

This is unfortunate.  Would it be possible to change one of the names so they
don't conflict?

[pavely, 2014/03/05 17:34:29]

I was talking to Colin about this yesterday. channel_common.proto is actually a
copy from java library with the same constant defined. They are not changing
java version and letting files diverge seemed worse than excluding file from
android build. Their primary focus for development is java client library
therefore I don't see us switching to native cacheinvalidations library for
android. This solution seems acceptable.

+            '<(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',
@@ -203,12 +215,25 @@
           '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',
           'dependencies': [
             '../../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': {