| Index: build/secondary/tools/grit/grit_rule.gni
|
| diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni
|
| index 5d3b1e44357ed5a2f6b4fa91e48587c804b10439..8742b21034a41ba7c767e11c2bfcc11a93c8ee3f 100644
|
| --- a/build/secondary/tools/grit/grit_rule.gni
|
| +++ b/build/secondary/tools/grit/grit_rule.gni
|
| @@ -371,20 +371,8 @@ template("grit") {
|
| script = "//tools/grit/grit.py"
|
| inputs = grit_inputs
|
|
|
| - # TODO(knn): Remove this once grit has rolled to recognize the flag.
|
| - depend_on_stamp =
|
| - defined(invoker.depend_on_stamp) && invoker.depend_on_stamp
|
| - if (depend_on_stamp) {
|
| - # Need this for migrating existing targets without clobbering.
|
| - depfile = "$output_dir/${grit_output_name}_stamp.d"
|
| - outputs = [
|
| - "${depfile}.stamp",
|
| - ]
|
| - } else {
|
| - depfile = "$output_dir/${grit_output_name}.d"
|
| - outputs = []
|
| - }
|
| - outputs += grit_outputs
|
| + depfile = "$output_dir/${grit_output_name}_stamp.d"
|
| + outputs = [ "${depfile}.stamp" ] + grit_outputs
|
|
|
| args = [
|
| "-i",
|
| @@ -398,18 +386,15 @@ template("grit") {
|
| ]
|
| }
|
| args += [
|
| - "-o",
|
| - rebased_output_dir,
|
| - "--depdir",
|
| - ".",
|
| - "--depfile",
|
| - rebase_path(depfile, root_build_dir),
|
| - "--write-only-new=1",
|
| - ]
|
| - if (depend_on_stamp) {
|
| - args += [ "--depend-on-stamp" ]
|
| - }
|
| - args += grit_defines
|
| + "-o",
|
| + rebased_output_dir,
|
| + "--depdir",
|
| + ".",
|
| + "--depfile",
|
| + rebase_path(depfile, root_build_dir),
|
| + "--write-only-new=1",
|
| + "--depend-on-stamp",
|
| + ] + grit_defines
|
|
|
| # Add extra defines with -D flags.
|
| if (defined(invoker.defines)) {
|
|
|