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 2e71733aabf06f89ae73704f1d7380aa00334bd7..acff5ca7b40bd7325d001a6596f4799aafd3404b 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',
@@ -146,6 +149,36 @@
         'cacheinvalidation_proto_cpp',
       ],
     },
+    # The Java files generated from the cache invalidation protocol buffers.

[akalin, 2012/10/26 00:11:47]

move this to right below the _cpp version

[nyquist, 2012/10/30 00:30:32]

Done.

+    {
+      'target_name': 'cacheinvalidation_proto_src_java',

[akalin, 2012/10/26 00:11:47]

remove _src to match _cpp version?

[nyquist, 2012/10/26 00:32:31]

This only generates the source files. Downstream we have another target that
generates a .jar-file (that is what you want to depend on). Is it OK to keep it
as is and then later add the .jar-target as cacheinvalidation_proto_java?

+      'type': 'none',
+      'variables': {
+        # The relative path of the Java cacheinvalidation proto files from
+        # this gyp-file.
+        'proto_in_dir': 'src',
+        # The paths to all the classes in the out directory.
+        'output_java_files': [
+          '>(java_out_dir)/com/google/protos/ipc/invalidation/AndroidChannel.java',
+          '>(java_out_dir)/com/google/protos/ipc/invalidation/AndroidState.java',
+          '>(java_out_dir)/com/google/protos/ipc/invalidation/ChannelCommon.java',
+          '>(java_out_dir)/com/google/protos/ipc/invalidation/Channel.java',
+          '>(java_out_dir)/com/google/protos/ipc/invalidation/Client.java',
+          '>(java_out_dir)/com/google/protos/ipc/invalidation/ClientProtocol.java',
+          '>(java_out_dir)/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',

[Ryan Sleevi, 2012/10/29 08:36:36]

don't repeat <(proto_in_dir)/proto

1) Your GYP file already documents sources as being relative to <(proto_in_dir)
2) You're still repeating /proto/.

Just said proto_in_dir to src/proto, and set sources as appropriate. Or update
your .gypi and remove the option entirely.

[nyquist, 2012/10/30 00:30:32]

1)
The proto directory needed to be set, and the content of the files had a form
like
import "proto/otherfile.proto", so we had to specify the paths relative to that.
2)
Added a new variable that includes /proto in the path.

+      ],
+      'includes': [ '../../build/protoc_java.gypi' ],
+    },
   ],
   'conditions': [
     ['test_isolation_mode != "noop"', {