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

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

Issue 386943006: Pull buildtools to get GN r282653 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « DEPS ('k') | components/autofill/content/browser/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 a9745b444a43170b95f3549cb840e25342f04be2..2f03335f3c4d0c59fa8d8582f053db5d00a05aae 100644
--- a/build/secondary/tools/grit/grit_rule.gni
+++ b/build/secondary/tools/grit/grit_rule.gni
@@ -187,9 +187,12 @@ template("grit") {
grit_flags,
"list lines")
- # The inputs are relative to the current (build) directory, rebase to
- # the current one.
- grit_outputs = rebase_path(grit_outputs_build_rel, ".", root_build_dir)
+ # The names returned by grit are relative to the current (build) directory,
+ # but references to files in this template are expected to be relative to the
+ # invoking BUILD.gn file's directory. Make it absolute so there's no
+ # ambiguity.
+ grit_outputs = get_path_info(
+ rebase_path(grit_outputs_build_rel, ".", root_build_dir), "abspath")
# The config and the action below get this visibility son only the generated
# source set can depend on them. The variable "target_name" will get
« no previous file with comments | « DEPS ('k') | components/autofill/content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698