Add support for generating jars from protos and add cacheinvalidation_java.

third_party/cacheinvalidation/cacheinvalidation.gyp

 # Copyright (c) 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,
-    # 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',
         '<(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': [
@@ skipping 106 matching lines @@
       ],
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:run_all_unittests',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
         'cacheinvalidation',
         '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"', {
       'targets': [
         {
           'target_name': 'cacheinvalidation_unittests_run',
           'type': 'none',
           'dependencies': [
             'cacheinvalidation_unittests',
           ],
           'includes': [
             '../../build/isolate.gypi',
             'cacheinvalidation_unittests.isolate',
           ],
           'sources': [
             'cacheinvalidation_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }