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

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

Issue 236713002: Implement net in GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « tools/gn/ninja_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/tools/grit/grit_rule.gni
diff --git a/tools/gn/secondary/tools/grit/grit_rule.gni b/tools/gn/secondary/tools/grit/grit_rule.gni
index f14a17588a8fab0552db85bedd2e67037e040ef4..8b28b241d7a986c40d94f35ba6d0a651014275ac 100644
--- a/tools/gn/secondary/tools/grit/grit_rule.gni
+++ b/tools/gn/secondary/tools/grit/grit_rule.gni
@@ -44,9 +44,15 @@ template("grit") {
[ "--outputs", "$output_dir", source_path, "-f", resource_ids ] +
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)
+ grit_outputs = rebase_path(grit_outputs_build_rel, ".", root_build_dir)
+
+ # 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
+ # overwritten inside the innter classes so we need to compute it here.
+ target_visibility = ":$target_name"
# The current grit setup makes an file in $target_gen_dir/grit/foo.h that
# the source code expects to include via "grit/foo.h". It would be nice to
@@ -55,14 +61,13 @@ template("grit") {
grit_config = target_name + "_grit_config"
config(grit_config) {
include_dirs = [ target_gen_dir ]
-
- # Only our generated static library can depend on this.
- visibility = ":" + target_name
+ visibility = target_visibility
}
grit_custom_target = target_name + "_grit"
action(grit_custom_target) {
script = "//tools/grit/grit.py"
+ hard_dep = true
source_prereqs = grit_inputs
outputs = grit_outputs
@@ -73,13 +78,12 @@ template("grit") {
"-o", output_dir,
] + grit_flags
- # Only our generated static library can depend on this.
- visibility = ":" + target_name
+ visibility = target_visibility
}
# This is the thing that people actually link with, it must be named the
# same as the argument the template was invoked with.
- static_library(target_name) {
+ source_set(target_name) {
# Since we generate a file, we need to be run before the targets that
# depend on us.
hard_dep = true
@@ -87,7 +91,6 @@ template("grit") {
# Deps set on the template invocation will go on the grit script running
# target rather than this library.
- deps = []
deps = [ ":$grit_custom_target" ]
direct_dependent_configs = [ ":$grit_config" ]
« no previous file with comments | « tools/gn/ninja_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698