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

Side by Side Diff: content/browser/tracing/tracing_resources.gyp

Issue 1485633002: Fix tracing_resources grit/generated file usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 { 5 {
6 'variables': { 6 'variables': {
7 'trace_viewer_src_dir': '../../../third_party/catapult/tracing', 7 'trace_viewer_src_dir': '../../../third_party/catapult/tracing',
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing',
9 }, 9 },
10 'targets': [ 10 'targets': [
11 { 11 {
12 # GN version: //content/browser/tracing:generate_tracing_grd 12 # GN version: //content/browser/tracing:generate_tracing_grd
13 'target_name': 'generate_tracing_grd', 13 'target_name': 'generate_tracing_grd',
14 'type': 'none', 14 'type': 'none',
15 'hard_dependency': 1,
15 'dependencies': [ 16 'dependencies': [
16 '<(trace_viewer_src_dir)/trace_viewer.gyp:generate_about_tracing', 17 '<(trace_viewer_src_dir)/trace_viewer.gyp:generate_about_tracing',
17 ], 18 ],
18 'actions': [ 19 'actions': [
19 { 20 {
20 'action_name': 'generate_tracing_grd', 21 'action_name': 'generate_tracing_grd',
21 'script_name': 'generate_trace_viewer_grd.py', 22 'script_name': 'generate_trace_viewer_grd.py',
22 'input_pages': [ 23 'input_pages': [
23 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/about_tracing.ht ml', 24 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/about_tracing.ht ml',
24 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/about_tracing.js ' 25 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/about_tracing.js '
25 ], 26 ],
26 'inputs': [ 27 'inputs': [
27 '<@(_script_name)', 28 '<@(_script_name)',
28 '<@(_input_pages)' 29 '<@(_input_pages)'
29 ], 30 ],
30 'outputs': [ 31 'outputs': [
31 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resource s.grd' 32 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resource s.grd'
32 ], 33 ],
33 'action': [ 34 'action': [
34 'python', '<@(_script_name)', '<@(_input_pages)', '--output', '<@(_o utputs)' 35 'python', '<@(_script_name)', '<@(_input_pages)', '--output', '<@(_o utputs)'
35 ] 36 ]
36 } 37 }
37 ] 38 ]
38 }, 39 },
39 40
40 { 41 {
41 # GN version: //content/browser/tracing:resources 42 # GN version: //content/browser/tracing:resources
42 'target_name': 'tracing_resources', 43 'target_name': 'tracing_resources',
43 'type': 'none', 44 'type': 'none',
45 'hard_dependency': 1,
44 'dependencies': [ 46 'dependencies': [
45 '<(trace_viewer_src_dir)/trace_viewer.gyp:generate_about_tracing', 47 '<(trace_viewer_src_dir)/trace_viewer.gyp:generate_about_tracing',
46 'generate_tracing_grd', 48 'generate_tracing_grd',
47 ], 49 ],
48 'variables': { 50 'variables': {
49 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing', 51 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing',
50 }, 52 },
51 'actions': [ 53 'actions': [
52 { 54 {
53 'action_name': 'tracing_resources', 55 'action_name': 'tracing_resources',
(...skipping 15 matching lines...) Expand all
69 # actions into ninja restat rules). 71 # actions into ninja restat rules).
70 ['"<(GENERATOR)"=="ninja"', { 72 ['"<(GENERATOR)"=="ninja"', {
71 'write_only_new': '1', 73 'write_only_new': '1',
72 }, { 74 }, {
73 'write_only_new': '0', 75 'write_only_new': '0',
74 }], 76 }],
75 ], 77 ],
76 }, 78 },
77 'inputs': [ 79 'inputs': [
78 '<(grit_grd_file)', 80 '<(grit_grd_file)',
81 '<(DEPTH)/tools/gritsettings/resource_ids',
79 '<!@pymod_do_main(grit_info --inputs)', 82 '<!@pymod_do_main(grit_info --inputs)',
80 ], 83 ],
81 'outputs': [ 84 'outputs': [
82 '<(grit_out_dir)/grit/tracing_resources.h', 85 '<(grit_out_dir)/grit/tracing_resources.h',
83 '<(grit_out_dir)/tracing_resources.pak', 86 '<(grit_out_dir)/tracing_resources.pak',
84 ], 87 ],
85 'action': ['<@(grit_cmd)', 88 'action': ['<@(grit_cmd)',
86 '-i', '<(grit_grd_file)', 'build', 89 '-i', '<(grit_grd_file)', 'build',
87 '-f', '<(DEPTH)/tools/gritsettings/resource_ids', 90 '-f', '<(DEPTH)/tools/gritsettings/resource_ids',
88 '-o', '<(grit_out_dir)', 91 '-o', '<(grit_out_dir)',
89 '--write-only-new=<(write_only_new)', 92 '--write-only-new=<(write_only_new)',
90 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)', 93 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
91 '<@(grit_defines)', 94 '<@(grit_defines)',
92 '<@(grit_rc_header_format)'], 95 '<@(grit_rc_header_format)'],
93 'message': 'Generating resources from <(grit_grd_file)', 96 'message': 'Generating resources from <(grit_grd_file)',
94 } 97 }
95 ], 98 ],
96 'includes': [ '../../../build/grit_target.gypi' ] 99 'includes': [ '../../../build/grit_target.gypi' ]
97 } 100 }
98 ] 101 ]
99 } 102 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698