💡 Fix jmake root_build_dir vs root_out_dir

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 1562 matching lines @@
     _rebased_depfile = rebase_path(depfile, root_build_dir)
     args = [
       "--depfile=$_rebased_depfile",
       "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)",
       "--jar-path=$_rebased_jar_path",
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
     ]
     if (_enable_incremental_javac) {
       args += [ "--incremental" ]
-      deps += [ "//third_party/jmake" ]
-      inputs += [ "$root_out_dir/bin/jmake" ]
+      deps += [ "//third_party/jmake($default_toolchain)" ]

[Dirk Pranke, 2016/06/03 18:19:34]

Are you sure this shouldn't be ($host_toolchain) ? Why would we run jmake on the
target?

[agrieve, 2016/06/03 18:49:58]

Toolchains & targets are a funny thing. Arguably we'd want to have a toolchain
just for java targets. E.g. with monochrome, we'll be rebuilding all the java
for arm64 and arm32, even though it's identical.

For this change, I figured using the version of jmake in the outermost build
directory made the most sense. 

+      inputs += [ "$root_build_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 728 matching lines @@
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }