diff options
Diffstat (limited to 'third_party/cacheinvalidation/cacheinvalidation.gyp')
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index 568f402..fcd8368 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -40,7 +40,7 @@ }, # 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 + # channel_common.proto contains definition of ANDROID constant which on # android build conflicts with compiler option -DANDROID. Remove protos # from android build. 'conditions': [ @@ -199,13 +199,13 @@ 'target_name': 'cacheinvalidation_proto_java', 'type': 'none', 'variables': { + 'proto_runtime': 'nano', '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_common.proto', '<(proto_in_dir)/client.proto', '<(proto_in_dir)/client_protocol.proto', @@ -215,25 +215,11 @@ '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': { @@ -242,20 +228,6 @@ }, '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' ], - }, ], }], ], |