Make java_binary wrapper scripts deps rather than data_deps.

build/config/android/internal_rules.gni

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 1309 matching lines @@
       ":$_process_jar_target_name",
     ]
     if (_supports_android) {
       deps += [ ":$_dex_target_name" ]
     }
     data_deps = []
     if (defined(invoker.data_deps)) {
       data_deps += invoker.data_deps
     }
     if (defined(invoker.main_class)) {
-      data_deps += [ ":$_binary_script_target_name" ]
+      # Some targets use the generated script while building, so make it a dep
+      # rather than a data_dep.
+      deps += [ ":$_binary_script_target_name" ]
     }
   }
 }
 
 # Compiles and jars a set of java files.
 #
 # Outputs:
 #  $jar_path.jar
 #  $jar_path.interface.jar
 #
@@ skipping 108 matching lines @@
       "--use-ijars",
       "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
       "--jar-path=$_rebased_jar_path",
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
       "--jar-excluded-classes=$_jar_excluded_patterns",
     ]
     if (_enable_incremental_javac) {
       args += [ "--incremental" ]
       deps += [ "//third_party/jmake" ]
+      inputs += [ "$root_out_dir/bin/jmake" ]
       outputs += [ "${_javac_jar_path}.pdb" ]
     }
     if (_supports_android) {
       if (defined(invoker.alternative_android_sdk_ijar)) {
         deps += [ invoker.alternative_android_sdk_ijar_dep ]
         _android_sdk_ijar = invoker.alternative_android_sdk_ijar
       } else {
         deps += [ "//build/android:android_ijar" ]
         _android_sdk_ijar = "$root_out_dir/lib.java/android.interface.jar"
       }
@@ skipping 217 matching lines @@
     java_files = _java_files
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
     chromium_code = _chromium_code
     supports_android = _supports_android
     emma_instrument = _emma_instrument
     deps = build_config_deps
   }
 
   if (defined(invoker.main_class)) {
-    _final_datadeps += [ ":${_template_name}__java_binary_script" ]
+    # Targets might use the generated script while building, so make it a dep
+    # rather than a data_dep.
+    _final_deps += [ ":${_template_name}__java_binary_script" ]
     java_binary_script("${_template_name}__java_binary_script") {
       forward_variables_from(invoker,
                              [
                                "bootclasspath",
                                "main_class",
                                "wrapper_script_args",
                              ])
       build_config = _build_config
       jar_path = _jar_path
       script_name = _template_name
@@ skipping 452 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }