Make javac and jar a single build action

build/java.gypi

 # 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 51 matching lines @@
     'additional_input_paths': [],
     'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar',
     'generated_src_dirs': ['>@(generated_R_dirs)'],
     'generated_R_dirs': [],
     'has_java_resources%': 0,
     'res_extra_dirs': [],
     'res_extra_files': [],
     'res_v14_verify_only%': 0,
     'resource_input_paths': ['>@(res_extra_files)'],
     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
-    'classes_dir': '<(intermediate_dir)/classes',
+    'classes_dir': '<(intermediate_dir)/classes/1/',

[newt (away), 2014/06/16 18:48:46]

why /1/ ?

[cjhopman, 2014/06/23 14:48:43]

Done. I was just confirming to myself that none of the steps below had
constructed the classes dir from <(intermediate_dir) themselves.

     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'lint_stamp': '<(intermediate_dir)/lint.stamp',
     'lint_result': '<(intermediate_dir)/lint_result.xml',
     'lint_config': '<(intermediate_dir)/lint_config.xml',
     'never_lint%': 0,
     'proguard_config%': '',
     'proguard_preprocess%': '0',
     'variables': {
       'variables': {
         'proguard_preprocess%': 0,
@@ skipping 140 matching lines @@
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
         '>@(input_jars_paths)',
         '>@(additional_input_paths)',
       ],
       'outputs': [
         '<(compile_stamp)',
+        '<(javac_jar_path)',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/javac.py',
-        '--output-dir=<(classes_dir)',
+        '--classes-dir=<(classes_dir)',
         '--classpath=>(input_jars_paths)',
         '--src-gendirs=>(generated_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
+        '--jar-path=<(javac_jar_path)',
+        '--jar-excluded-classes=<(jar_excluded_classes)',
         '--stamp=<(compile_stamp)',
         '>@(java_sources)',
       ]
     },
     {
       'variables': {
         'src_dirs': [
           '<(java_in_dir)/src',
           '>@(additional_src_dirs)',
         ],
         'stamp_path': '<(lint_stamp)',
         'result_path': '<(lint_result)',
         'config_path': '<(lint_config)',
       },
       'inputs': [
         '<(compile_stamp)',
       ],
       'outputs': [
         '<(lint_stamp)',
       ],
       'includes': [ 'android/lint_action.gypi' ],
     },
     {
-      'action_name': 'jar_<(_target_name)',
-      'message': 'Creating <(_target_name) jar',
-      'inputs': [
-        '<(DEPTH)/build/android/gyp/util/build_utils.py',
-        '<(DEPTH)/build/android/gyp/util/md5_check.py',
-        '<(DEPTH)/build/android/gyp/jar.py',
-        '<(compile_stamp)',
-      ],
-      'outputs': [
-        '<(javac_jar_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/gyp/jar.py',
-        '--classes-dir=<(classes_dir)',
-        '--jar-path=<(javac_jar_path)',
-        '--excluded-classes=<(jar_excluded_classes)',
-      ]
-    },
-    {
       'action_name': 'instr_jar_<(_target_name)',
       'message': 'Instrumenting <(_target_name) jar',
       'variables': {
         'input_path': '<(jar_path)',
         'output_path': '<(jar_final_path)',
         'stamp_path': '<(instr_stamp)',
         'instr_type': 'jar',
       },
       'outputs': [
         '<(jar_final_path)',
@@ skipping 29 matching lines @@
             'dex_no_locals': 1,
           }],
         ],
         'dex_input_paths': [ '<(jar_final_path)' ],
         'output_path': '<(dex_path)',
       },
       'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }