Fix javac --incremental by using jmake for dependency analysis

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/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 181 matching lines @@
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--android-sdk-tools",
       rebased_android_sdk_build_tools,
       "--dex-path",
       rebased_output,
     ]
 
-    if (incremental_dx) {
+    if (enable_incremental_dx) {
       args += [ "--incremental" ]
     }
 
     if (defined(invoker.no_locals) && invoker.no_locals) {
       args += [ "--no-locals=1" ]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
@@ skipping 828 matching lines @@
     _supports_android = invoker.supports_android
   }
 
   _enable_errorprone = use_errorprone_java_compiler
   if (!_chromium_code) {
     _enable_errorprone = false
   } else if (defined(invoker.enable_errorprone)) {
     _enable_errorprone = invoker.enable_errorprone
   }
 
+  _enable_incremental_javac = enable_incremental_javac
+  if (defined(invoker.enable_incremental_javac)) {
+    _enable_incremental_javac = invoker.enable_incremental_javac
+  }
+
   _manifest_entries = []
   if (defined(invoker.manifest_entries)) {
     _manifest_entries = invoker.manifest_entries
   }
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps += invoker.srcjar_deps
   }
 
@@ skipping 39 matching lines @@
     _rebased_depfile = rebase_path(depfile, root_build_dir)
     args = [
       "--depfile=$_rebased_depfile",
       "--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 (incremental_javac) {
+    if (_enable_incremental_javac) {
       args += [ "--incremental" ]
+      deps += [ "//third_party/jmake" ]

[Yaron, 2015/09/30 02:19:25]

this is purely a build-rule dependency and doesn't affect classpath, right?

[agrieve, 2015/10/01 16:26:11]

correct. Would need to be a dep of write_build_config to affect classpath.

+      outputs += [ "${_intermediate_jar_path}.pdb" ]
     }
     if (_supports_android) {
       deps += [ "//build/android:android_ijar" ]
       _android_sdk_ijar = "$root_out_dir/lib.java/android.interface.jar"
       inputs += [ _android_sdk_ijar ]
       _rebased_android_sdk_ijar = rebase_path(_android_sdk_ijar, root_build_dir)
       args += [ "--bootclasspath=$_rebased_android_sdk_ijar" ]
     }
     foreach(e, _manifest_entries) {
       args += [ "--manifest-entry=" + e ]
@@ skipping 147 matching lines @@
   }
   assert(_java_files != [] || _srcjar_deps != [] || _srcjars != [])
 
   _compile_java_target = "${_template_name}__compile_java"
   _final_deps += [ ":$_compile_java_target" ]
   compile_java(_compile_java_target) {
     forward_variables_from(invoker,
                            [
                              "dist_jar_path",
                              "enable_errorprone",
+                             "enable_incremental_javac",
                              "jar_excluded_patterns",
                              "manifest_entries",
                              "proguard_config",
                              "proguard_preprocess",
                            ])
     jar_path = _jar_path
     build_config = _build_config
     java_files = _java_files
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
@@ skipping 347 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }