Commit 35fc212e authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

dex.py: Remove obsolete flags, code clean-up.

Change-Id: I20d7316522446b934583fb23ff34f9212b0fb346
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1694090
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676101}
parent dde83b31
This diff is collapsed.
...@@ -1300,13 +1300,11 @@ if (enable_java_templates) { ...@@ -1300,13 +1300,11 @@ if (enable_java_templates) {
invoker.output, invoker.output,
] ]
_rebased_output = rebase_path(invoker.output, root_build_dir)
args = [ args = [
"--depfile", "--depfile",
rebase_path(depfile, root_build_dir), rebase_path(depfile, root_build_dir),
"--dex-path", "--output",
_rebased_output, rebase_path(outputs[0], root_build_dir),
] ]
if (_proguard_enabled) { if (_proguard_enabled) {
...@@ -1327,7 +1325,7 @@ if (enable_java_templates) { ...@@ -1327,7 +1325,7 @@ if (enable_java_templates) {
if (defined(invoker.input_dex_classpath)) { if (defined(invoker.input_dex_classpath)) {
inputs += [ invoker.build_config ] inputs += [ invoker.build_config ]
args += [ "--inputs=@FileArg(${invoker.input_dex_classpath})" ] args += [ "--input-list=@FileArg(${invoker.input_dex_classpath})" ]
} }
inputs += _dexing_jars inputs += _dexing_jars
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment