build/java_cpp_template.gypi: new build rules.

net/net.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': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 2259 matching lines @@
             'java_in_dir': '../net/android/javatests',
           },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'net_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
-          # This should be extracted to a gypi file and parameterized if
-          # we have more use cases of using the preprocessor to build java files.
           'target_name': 'net_errors_java',
           'type': 'none',
-          'direct_dependent_settings': {
-            'variables': {
-              'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/net/template/'],
-              'additional_input_paths': ['<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java'],

[Ryan Sleevi, 2012/12/07 03:20:10]

Do you no longer have to specify additional_input_paths to reference the
specific generated .java files?

Is that a bug in the _template.gypi?

[digit1, 2012/12/07 08:46:07]

I believe this is handled by the 'generated_src_dirs' section in
java_cpp_template.gypi. I've tested this manually by doing the following
operations:

- clean build
- only touch net/base/net_error_list.h + rebuild
- only touch NetError.template + rebuild
- remove the generated NetError.java file + rebuild

In all cases, the build/rebuild seems to complete fine, so I guess that's
enough. However, if you think there is an edge case that wouldn't be covered,
please let me know.

If 'additional_input_paths' is required, it turns out a new variable will be
needed in the caller to give the name of the output file. I don't think there is
a way to perform file name translations (e.g. "NetError.template" ->
"NetError.java") e.g. outside of a 'rules' section, and of course, one cannot
add 'variables' inside a 'rules' section.

-            },
+          'sources': [
+            'base/net_error_list.h',
+            'android/java/NetError.template',
+          ],
+          'variables': {
+            'package_name': 'org.chromium.net',
           },
-          'actions': [
-            {
-              'action_name': 'generate_net_errors_java',
-              'inputs': [
-                'android/java/net_errors_java.template',
-              ],
-              'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/net/template/NetError.java',
-              ],
-              'action': [
-                'gcc',
-                '-x', 'c-header',
-                '-E', '-P',
-                '-I', '..',
-                '-o',
-                '<@(_outputs)',
-                '<@(_inputs)',
-              ],
-              'message': 'Preprocessing <(_inputs)',
-              'process_outputs_as_sources': 1,
-            },
-          ],
-        },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        }
       ],
     }],
     # Special target to wrap a gtest_target_type==shared_library
     # net_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'net_unittests_apk',
           'type': 'none',
@@ skipping 40 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }