Roll cacheinvalidation DEPS to r330

third_party/cacheinvalidation/cacheinvalidation.gyp

 # 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.
 
 {
   'variables': {
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
   },
   'targets': [
     # The C++ files generated from the cache invalidation protocol buffers.
     {
       'target_name': 'cacheinvalidation_proto_cpp',
       'type': 'static_library',
       'variables': {
         # The relative path of the cacheinvalidation proto files from this
         # gyp-file.
         # TODO(akalin): Add a RULE_INPUT_DIR predefined variable to gyp so
         # we don't need this variable.
         'proto_dir_relpath': 'google/cacheinvalidation',
         # Where files generated from proto files are put.
         'proto_in_dir': 'src/<(proto_dir_relpath)',
         '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',
         '<(proto_in_dir)/client_test_internal.proto',
         '<(proto_in_dir)/types.proto',
       ],
       'includes': [ '../../build/protoc.gypi' ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(proto_out_dir)',
         ],
       },
       # 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.
     {
       'target_name': 'cacheinvalidation',
       'type': 'static_library',
       'sources': [
         'overrides/google/cacheinvalidation/deps/callback.h',
         'overrides/google/cacheinvalidation/deps/gmock.h',
         'overrides/google/cacheinvalidation/deps/googletest.h',
@@ skipping 135 matching lines @@
           'target_name': 'cacheinvalidation_proto_java',
           'type': 'none',
           'variables': {
             'proto_in_dir': '../../third_party/cacheinvalidation/src/proto',
           },
           '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',
             '<(proto_in_dir)/channel_common.proto',
             '<(proto_in_dir)/client.proto',
             '<(proto_in_dir)/client_protocol.proto',
             '<(proto_in_dir)/java_client.proto',
             '<(proto_in_dir)/types.proto',
           ],
           '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': {
             'java_in_dir': '../../build/android/empty',
             'additional_src_dirs': [ 'src/java/' ],
           },
           'includes': [ '../../build/java.gypi' ],
         },
         {
           'target_name': 'cacheinvalidation_aidl_javalib',
           'type': 'none',
           'variables': {
             # TODO(shashishekhar): aidl_interface_file should be made optional.
             'aidl_interface_file':'<(android_sdk)/framework.aidl'
           },
           'sources': [
             'src/java/com/google/ipc/invalidation/external/client/android/service/InvalidationService.aidl',
             'src/java/com/google/ipc/invalidation/external/client/android/service/ListenerService.aidl',
             'src/java/com/google/ipc/invalidation/testing/android/InvalidationTest.aidl',
           ],
           'includes': [ '../../build/java_aidl.gypi' ],
         },
       ],
     }],
   ],
 }