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

Side by Side Diff: build/secondary/tools/grit/grit_rule.gni

Issue 877333002: Fix build flakes in GN build due to wrong deps for grit action. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase after revert of original, problematic CL. Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Instantiate grit. This will produce a script target to run grit, and a 5 # Instantiate grit. This will produce a script target to run grit, and a
6 # static library that compiles the .cc files. 6 # static library that compiles the .cc files.
7 # 7 #
8 # Parameters 8 # Parameters
9 # 9 #
10 # source (required) 10 # source (required)
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 # output_name (optiona) 47 # output_name (optiona)
48 # Provide an alternate base name for the generated files, like the .d 48 # Provide an alternate base name for the generated files, like the .d
49 # files. Normally these are based on the target name and go in the 49 # files. Normally these are based on the target name and go in the
50 # output_dir, but if multiple targets with the same name end up in 50 # output_dir, but if multiple targets with the same name end up in
51 # the same output_dir, they can collide. 51 # the same output_dir, they can collide.
52 # 52 #
53 # use_qualified_include (optional) 53 # use_qualified_include (optional)
54 # If set, output_dir is not added to include_dirs. 54 # If set, output_dir is not added to include_dirs.
55 # 55 #
56 # deps (optional) 56 # deps (optional)
57 # inputs (optional)
58 # List of additional files, required for grit to process source file.
57 # visibility (optional) 59 # visibility (optional)
58 # Normal meaning. 60 # Normal meaning.
59 # 61 #
60 # Example 62 # Example
61 # 63 #
62 # grit("my_resources") { 64 # grit("my_resources") {
63 # # Source and outputs are required. 65 # # Source and outputs are required.
64 # source = "myfile.grd" 66 # source = "myfile.grd"
65 # outputs = [ 67 # outputs = [
66 # "foo_strings.h", 68 # "foo_strings.h",
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 # we want to keep the public "no visibility specified" default. 408 # we want to keep the public "no visibility specified" default.
407 visibility = target_visibility + invoker.visibility 409 visibility = target_visibility + invoker.visibility
408 } 410 }
409 411
410 deps = [ 412 deps = [
411 "//tools/grit:grit_sources", 413 "//tools/grit:grit_sources",
412 ] 414 ]
413 if (defined(invoker.deps)) { 415 if (defined(invoker.deps)) {
414 deps += invoker.deps 416 deps += invoker.deps
415 } 417 }
418 if (defined(invoker.inputs)) {
419 inputs += invoker.inputs
420 }
416 } 421 }
417 422
418 # This is the thing that people actually link with, it must be named the 423 # This is the thing that people actually link with, it must be named the
419 # same as the argument the template was invoked with. 424 # same as the argument the template was invoked with.
420 source_set(target_name) { 425 source_set(target_name) {
421 # Since we generate a file, we need to be run before the targets that 426 # Since we generate a file, we need to be run before the targets that
422 # depend on us. 427 # depend on us.
423 sources = grit_outputs 428 sources = grit_outputs
424 429
425 # Deps set on the template invocation will go on the grit script running 430 # Deps set on the template invocation will go on the grit script running
426 # target rather than this library. 431 # target rather than this library.
427 deps = [ 432 deps = [
428 ":$grit_custom_target", 433 ":$grit_custom_target",
429 ] 434 ]
430 public_configs = [ ":$grit_config" ] 435 public_configs = [ ":$grit_config" ]
431 436
432 if (defined(invoker.public_configs)) { 437 if (defined(invoker.public_configs)) {
433 public_configs += invoker.public_configs 438 public_configs += invoker.public_configs
434 } 439 }
435 440
436 if (defined(invoker.visibility)) { 441 if (defined(invoker.visibility)) {
437 visibility = invoker.visibility 442 visibility = invoker.visibility
438 } 443 }
439 output_name = grit_output_name 444 output_name = grit_output_name
440 } 445 }
441 } 446 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698