Index: build/config/android/internal_rules.gni |
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
index 661ed253a3ad83bcb163df9d8264cb151896854c..4aa304e7f735bab55ca2d21c4ad7ee900be636bf 100644 |
--- a/build/config/android/internal_rules.gni |
+++ b/build/config/android/internal_rules.gni |
@@ -557,9 +557,7 @@ if (enable_java_templates) { |
if (defined(invoker.input_jars_paths)) { |
_input_jars_paths += invoker.input_jars_paths |
} |
- inputs = [ |
- _proguard_jar_path, |
- ] |
+ inputs = _input_jars_paths + [ _proguard_jar_path ] |
if (defined(invoker.alternative_android_sdk_jar)) { |
inputs += [ invoker.alternative_android_sdk_jar ] |
_rebased_android_sdk_jar = |
@@ -591,7 +589,7 @@ if (enable_java_templates) { |
_rebased_android_sdk_jar, |
] |
foreach(c, _input_jars_paths) { |
- args += [ "--classpath=" + c ] |
+ args += [ "--classpath=" + rebase_path(c, root_build_dir) ] |
paulmiller
2016/06/28 18:10:20
I did the rebase in third_party/android/BUILD.gn,
agrieve
2016/06/28 18:35:05
:( That's definitely the wrong place for it. We'll
paulmiller
2016/06/28 18:40:48
I would have thought that rebase_path would be sma
|
} |
if (proguard_verbose) { |
args += [ "--verbose" ] |