Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: build/config/android/internal_rules.gni

Issue 2037113002: 💡 Fix jmake root_build_dir vs root_out_dir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index ffe5bf37ab578d2910c9f4f244bbdc464b2716ed..1c79ba54ac5fb054975453f92b6cb986a765b1d9 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1580,8 +1580,8 @@ template("compile_java") {
]
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) ?
agrieve 2016/06/03 18:49:58 Toolchains & targets are a funny thing. Arguably w
+ inputs += [ "$root_build_dir/bin/jmake" ]
outputs += [ "${_javac_jar_path}.pdb" ]
}
if (_supports_android) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698