diff options
| author | agrieve <agrieve@chromium.org> | 2015-10-02 10:27:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 17:28:49 +0000 |
| commit | fef292dbfd9b6cea6ae67ad1e939f8efc489b039 (patch) | |
| tree | 095862f848d1cf412bca98bc145778e2943783b9 /build/config/android/internal_rules.gni | |
| parent | b136e1257ec0512058dfee15126386821c231d61 (diff) | |
| download | chromium_src-fef292dbfd9b6cea6ae67ad1e939f8efc489b039.zip chromium_src-fef292dbfd9b6cea6ae67ad1e939f8efc489b039.tar.gz chromium_src-fef292dbfd9b6cea6ae67ad1e939f8efc489b039.tar.bz2 | |
Fix javac --incremental by using jmake for dependency analysis
BUG=536817
Review URL: https://codereview.chromium.org/1373723003
Cr-Commit-Position: refs/heads/master@{#352065}
Diffstat (limited to 'build/config/android/internal_rules.gni')
| -rw-r--r-- | build/config/android/internal_rules.gni | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 0a8f64d..f9cdaf2 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -199,7 +199,7 @@ template("dex") { rebased_output, ] - if (incremental_dx) { + if (enable_incremental_dx) { args += [ "--incremental" ] } @@ -1048,6 +1048,11 @@ template("compile_java") { _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 @@ -1107,8 +1112,10 @@ template("compile_java") { "--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" ] + outputs += [ "${_intermediate_jar_path}.pdb" ] } if (_supports_android) { deps += [ "//build/android:android_ijar" ] @@ -1276,6 +1283,7 @@ template("java_library_impl") { [ "dist_jar_path", "enable_errorprone", + "enable_incremental_javac", "jar_excluded_patterns", "manifest_entries", "proguard_config", |