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

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

Issue 250903002: Take grit_rc_header_format into account in grit actions that don't use build/grit_action.gypi. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: add default variable 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/devtools/devtools_resources.gyp ('k') | 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/trace-viewer', 7 'trace_viewer_src_dir': '../../../third_party/trace-viewer',
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': [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 }, 48 },
49 'actions': [ 49 'actions': [
50 { 50 {
51 'action_name': 'tracing_resources', 51 'action_name': 'tracing_resources',
52 # This can't use build/grit_action.gypi because the grd file 52 # This can't use build/grit_action.gypi because the grd file
53 # is generated at build time, so the trick of using grit_info to get 53 # is generated at build time, so the trick of using grit_info to get
54 # the real inputs/outputs at GYP time isn't possible. 54 # the real inputs/outputs at GYP time isn't possible.
55 'variables': { 55 'variables': {
56 'grit_cmd': ['python', '../../../tools/grit/grit.py'], 56 'grit_cmd': ['python', '../../../tools/grit/grit.py'],
57 'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing /tracing_resources.grd', 57 'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing /tracing_resources.grd',
58 'grit_rc_header_format%': '',
58 }, 59 },
59 'inputs': [ 60 'inputs': [
60 '<(grit_grd_file)', 61 '<(grit_grd_file)',
61 '<!@pymod_do_main(grit_info --inputs)', 62 '<!@pymod_do_main(grit_info --inputs)',
62 ], 63 ],
63 'outputs': [ 64 'outputs': [
64 '<(grit_out_dir)/grit/tracing_resources.h', 65 '<(grit_out_dir)/grit/tracing_resources.h',
65 '<(grit_out_dir)/tracing_resources.pak', 66 '<(grit_out_dir)/tracing_resources.pak',
66 ], 67 ],
67 'action': ['<@(grit_cmd)', 68 'action': ['<@(grit_cmd)',
68 '-i', '<(grit_grd_file)', 'build', 69 '-i', '<(grit_grd_file)', 'build',
69 '-f', '<(DEPTH)/tools/gritsettings/resource_ids', 70 '-f', '<(DEPTH)/tools/gritsettings/resource_ids',
70 '-o', '<(grit_out_dir)', 71 '-o', '<(grit_out_dir)',
71 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)', 72 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
72 '<@(grit_defines)' ], 73 '<@(grit_defines)',
74 '<@(grit_rc_header_format)'],
73 'message': 'Generating resources from <(grit_grd_file)', 75 'message': 'Generating resources from <(grit_grd_file)',
74 } 76 }
75 ], 77 ],
76 'includes': [ '../../../build/grit_target.gypi' ] 78 'includes': [ '../../../build/grit_target.gypi' ]
77 } 79 }
78 ] 80 ]
79 } 81 }
OLDNEW
« no previous file with comments | « content/browser/devtools/devtools_resources.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698