Make javac and jar a single build action

build/java_apk.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 Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 76 matching lines @@
     'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h',
     '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,
     'instr_stamp': '<(intermediate_dir)/instr.stamp',
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
     'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
     'strip_stamp': '<(intermediate_dir)/strip.stamp',
-    'classes_dir': '<(intermediate_dir)/classes',
-    'classes_final_dir': '<(intermediate_dir)/classes_instr',
+    'classes_dir': '<(intermediate_dir)/classes/2',

[cjhopman, 2014/06/23 22:36:48]

This is the bad line. We generate java files into /2. This means that during
this build we will delete everything in classes/2/ but not in classes/. So now,
classes/ contains duplicates of all the class files.

Then, when syncing back the other way, if no .java files change, we won't delete
this directory, but we will jar it. This happily grabs both copies of the .class
files and then fails dexing.

This is one of the problems with the previous way that we did javac+jar (we
leave random .class files all over the place that we have to be careful with
cleaning/moving). The new way (that this change does most of the work for) does
not have that problem. The .class files are generated in a temporary directory
and the output is a .jar of just the .class files from this build.

     'javac_includes': [],
     'jar_excluded_classes': [],
+    'javac_jar_path': '<(intermediate_dir)/<(_target_name).javac.jar',
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'test_jar_path': '<(PRODUCT_DIR)/test.lib.java/<(apk_name).jar',
     'dex_path': '<(intermediate_dir)/classes.dex',
     'emma_device_jar': '<(android_sdk_root)/tools/lib/emma_device.jar',
     'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'package_resources_stamp': '<(intermediate_dir)/package_resources.stamp',
     'resource_zip_path': '<(intermediate_dir)/<(_target_name).resources.zip',
@@ skipping 35 matching lines @@
       ],
     },
     'native_lib_target%': '',
     'native_lib_version_name%': '',
     'use_chromium_linker%' : 0,
     'enable_chromium_linker_tests%': 0,
     'emma_instrument%': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
     'extra_native_libs': [],
-    'apk_dex_input_paths': [ '>@(library_dexed_jars_paths)' ],
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'conditions': [
       ['proguard_enabled == "true"', {
         'variables': {
           'proguard_enabled': 'true',
         }
@@ skipping 366 matching lines @@
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
       ],
       'conditions': [
         ['native_lib_target != ""', {
           'inputs': [ '<(native_libraries_java_stamp)' ],
         }],
       ],
       '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) <(android_sdk_jar)',
         '--src-gendirs=>(gen_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': 'instr_classes_<(_target_name)',
-      'message': 'Instrumenting <(_target_name) classes',
+      'action_name': 'instr_jar_<(_target_name)',
+      'message': 'Instrumenting <(_target_name) jar',
       'variables': {
-        'input_path': '<(classes_dir)',
-        'output_path': '<(classes_final_dir)',
+        'input_path': '<(javac_jar_path)',
+        'output_path': '<(jar_path)',
         'stamp_path': '<(instr_stamp)',
-        'instr_type': 'classes',
+        'instr_type': 'jar',
       },
-      'inputs': [
-        '<(compile_stamp)',
-      ],
       'outputs': [
         '<(instr_stamp)',
+        '<(jar_path)',
+      ],
+      'inputs': [
+        '<(javac_jar_path)',
       ],
       'includes': [ 'android/instr_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',
-        '<(instr_stamp)',
-      ],
-      'outputs': [
-        '<(jar_stamp)',
-        '<(jar_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/gyp/jar.py',
-        '--classes-dir=<(classes_final_dir)',
-        '--jar-path=<(jar_path)',
-        '--excluded-classes=<(jar_excluded_classes)',
-        '--stamp=<(jar_stamp)',
-      ]
-    },
-    {
       'action_name': 'obfuscate_<(_target_name)',
       'message': 'Obfuscating <(_target_name)',
       'variables': {
         'additional_obfuscate_options': [],
         'additional_obfuscate_input_paths': [],
         'proguard_out_dir': '<(intermediate_dir)/proguard',
         'proguard_input_jar_paths': [
           '>@(input_jars_paths)',
           '<(jar_path)',
         ],
@@ skipping 67 matching lines @@
         '--proguard-jar-path', '<(android_sdk_root)/tools/proguard/lib/proguard.jar',
 
         '--stamp', '<(obfuscate_stamp)',
 
         '>@(additional_obfuscate_options)',
       ],
     },
     {
       'action_name': 'dex_<(_target_name)',
       'variables': {
-        'output_path': '<(dex_path)',
         'dex_input_paths': [
-          '>@(apk_dex_input_paths)',
+          '>@(library_dexed_jars_paths)',
           '<(jar_path)',
         ],
+        'output_path': '<(dex_path)',
         'proguard_enabled_input_path': '<(obfuscated_jar_path)',
       },
       'target_conditions': [
         ['emma_instrument != 0', {
           'dex_no_locals': 1,
           'dex_input_paths': [
             '<(emma_device_jar)'
           ],
         }],
         ['is_test_apk == 1 and tested_apk_dex_path != "/"', {
@@ skipping 97 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }