Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3404)

Unified Diff: build/secondary/tools/grit/grit_rule.gni

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/secondary/third_party/libsrtp/BUILD.gn ('k') | build/toolchain/win/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 35bbed32734815ec67ecad23ccb411f5cd661a49..95a5e2e1332705ae8ad358d69cd26ee60c595ad4 100644
--- a/build/secondary/tools/grit/grit_rule.gni
+++ b/build/secondary/tools/grit/grit_rule.gni
@@ -313,7 +313,11 @@ template("grit") {
} else {
resource_ids = grit_resource_id_file
}
- grit_inputs += [ resource_ids ] # Script depends on ID file.
+ if (resource_ids != "") {
+ # The script depends on the ID file. Only add this dependency if the ID
+ # file is specified.
+ grit_inputs += [ resource_ids ]
+ }
if (defined(invoker.output_dir)) {
output_dir = invoker.output_dir
@@ -445,9 +449,11 @@ template("grit") {
# depend on us.
sources = grit_outputs
- # Deps set on the template invocation will go on the grit script running
- # target rather than this library.
- deps = [
+ # Deps set on the template invocation will go on the action that runs
+ # grit above rather than this library. This target needs to depend on the
+ # action publicly so other scripts can take the outputs from the grit
+ # script as inputs.
+ public_deps = [
":$grit_custom_target",
]
public_configs = [ ":$grit_config" ]
« no previous file with comments | « build/secondary/third_party/libsrtp/BUILD.gn ('k') | build/toolchain/win/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698