Commit fd9bbb76 authored by brettw's avatar brettw Committed by Commit bot

Add grit resource ID file to GN grit script inputs.

Grit's execution depends on the resource ID file, but this was not listed as a dependency in grit targets. This means that changing the resource ID file wouldn't re-run grit.

Review URL: https://codereview.chromium.org/1038213002

Cr-Commit-Position: refs/heads/master@{#322531}
parent dc219a79
...@@ -299,11 +299,14 @@ template("grit") { ...@@ -299,11 +299,14 @@ template("grit") {
assert(defined(invoker.source), assert(defined(invoker.source),
"\"source\" must be defined for the grit template $target_name") "\"source\" must be defined for the grit template $target_name")
grit_inputs = [ invoker.source ]
if (defined(invoker.resource_ids)) { if (defined(invoker.resource_ids)) {
resource_ids = invoker.resource_ids resource_ids = invoker.resource_ids
} else { } else {
resource_ids = grit_resource_id_file resource_ids = grit_resource_id_file
} }
grit_inputs += [ resource_ids ] # Script depends on ID file.
if (defined(invoker.output_dir)) { if (defined(invoker.output_dir)) {
output_dir = invoker.output_dir output_dir = invoker.output_dir
...@@ -331,8 +334,6 @@ template("grit") { ...@@ -331,8 +334,6 @@ template("grit") {
grit_flags = [] # These are optional so default to empty list. grit_flags = [] # These are optional so default to empty list.
} }
grit_inputs = [ invoker.source ]
assert_files_flags = [] assert_files_flags = []
# We want to make sure the declared outputs actually match what Grit is # We want to make sure the declared outputs actually match what Grit is
......
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