OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # Instantiate grit. This will produce a script target to run grit, and a | 5 # Instantiate grit. This will produce a script target to run grit, and a |
6 # static library that compiles the .cc files. | 6 # static library that compiles the .cc files. |
7 # | 7 # |
8 # Parameters | 8 # Parameters |
9 # | 9 # |
10 # source (required) | 10 # source (required) |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
395 js_minifier_command = "$js_minifier_command --closure_args" | 395 js_minifier_command = "$js_minifier_command --closure_args" |
396 foreach(closure_arg, | 396 foreach(closure_arg, |
397 common_closure_args + minifying_closure_args + | 397 common_closure_args + minifying_closure_args + |
398 default_disabled_closure_args) { | 398 default_disabled_closure_args) { |
399 js_minifier_command = "$js_minifier_command $closure_arg" | 399 js_minifier_command = "$js_minifier_command $closure_arg" |
400 } | 400 } |
401 args += [ | 401 args += [ |
402 "--js-minifier", | 402 "--js-minifier", |
403 js_minifier_command, | 403 js_minifier_command, |
404 ] | 404 ] |
405 inputs += [ _js_minifier ] | 405 inputs += [ |
406 _js_minifier, | |
407 "//third_party/closure_compiler/compiler/compiler.jar", | |
flackr
2017/06/05 17:39:46
I'm not sure I follow this change, is this invalid
wychen
2017/06/05 17:46:25
The dependency was underspecified, so that when cl
flackr
2017/06/05 17:54:54
Ah I see, this makes sense to do as a separate com
wychen
2017/06/05 18:25:56
I'll create a separate CL.
What do you mean by arg
flackr
2017/06/05 18:46:40
Ah okay, as long as argument changes in closure_ar
wychen
2017/06/05 19:05:43
Split out here:
https://codereview.chromium.org/29
| |
408 ] | |
406 } | 409 } |
407 | 410 |
408 # Must be after the args are computed since they are re-used. | 411 # Must be after the args are computed since they are re-used. |
409 # See the comments for the two variables used in this condition for | 412 # See the comments for the two variables used in this condition for |
410 # why this works this way. | 413 # why this works this way. |
411 if (compute_grit_inputs_for_analyze && !source_is_generated) { | 414 if (compute_grit_inputs_for_analyze && !source_is_generated) { |
412 grit_info_script = "//tools/grit/grit_info.py" | 415 grit_info_script = "//tools/grit/grit_info.py" |
413 grit_info_args = [ | 416 grit_info_args = [ |
414 "--inputs", | 417 "--inputs", |
415 source_path, | 418 source_path, |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
471 if (defined(invoker.configs)) { | 474 if (defined(invoker.configs)) { |
472 configs += invoker.configs | 475 configs += invoker.configs |
473 } | 476 } |
474 | 477 |
475 if (defined(invoker.visibility)) { | 478 if (defined(invoker.visibility)) { |
476 visibility = invoker.visibility | 479 visibility = invoker.visibility |
477 } | 480 } |
478 output_name = grit_output_name | 481 output_name = grit_output_name |
479 } | 482 } |
480 } | 483 } |
OLD | NEW |