Add support for generating jars from protos and add cacheinvalidation_java.

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 0f1aac5182c6f94f44b239d8990a048b1a3cbac8..d25c2888505b8a7a088dc804ef9154fb37732ad5 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -7,19 +7,22 @@
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
-    # The relative path of the cacheinvalidation proto files from 'src'.
-    # 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)',
   },
   '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)/client.proto',
         '<(proto_in_dir)/client_gateway.proto',
@@ -178,5 +181,37 @@
         },
       ],
     },
+    # The Java files generated from the cache invalidation protocol buffers.
+    {
+      'target_name': 'cacheinvalidation_proto_src_java',
+      'type': 'none',
+      'variables': {
+        # The relative path of the Java cacheinvalidation proto files from
+        # this gyp-file.
+        'proto_in_dir': 'src',
+        # Where files generated from proto files are put.
+        'proto_out_dir': 'cacheinvalidation/src',
+        # The paths to all the classes in the out directory.
+        'output_java_files': [
+          'com/google/protos/ipc/invalidation/AndroidChannel.java',

[cjhopman, 2012/10/15 22:14:24]

These need to be prefixed by >(java_dir)

[cjhopman, 2012/10/15 22:15:10]

Done.

+          'com/google/protos/ipc/invalidation/AndroidState.java',
+          'com/google/protos/ipc/invalidation/ChannelCommon.java',
+          'com/google/protos/ipc/invalidation/Channel.java',
+          'com/google/protos/ipc/invalidation/Client.java',
+          'com/google/protos/ipc/invalidation/ClientProtocol.java',
+          'com/google/protos/ipc/invalidation/Types.java',
+        ],
+      },
+      'sources': [
+        '<(proto_in_dir)/proto/android_channel.proto',
+        '<(proto_in_dir)/proto/android_state.proto',
+        '<(proto_in_dir)/proto/channel_common.proto',
+        '<(proto_in_dir)/proto/channel.proto',
+        '<(proto_in_dir)/proto/client.proto',
+        '<(proto_in_dir)/proto/client_protocol.proto',
+        '<(proto_in_dir)/proto/types.proto',
+      ],
+      'includes': [ '../../build/protoc_java.gypi' ],
+    },
   ],
 }