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

Side by Side Diff: content/browser/devtools/devtools_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, 7 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 | « no previous file | content/browser/tracing/tracing_resources.gyp » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'devtools_resources', 8 'target_name': 'devtools_resources',
9 'type': 'none', 9 'type': 'none',
10 'dependencies': [ 10 'dependencies': [
11 '../../../third_party/WebKit/public/blink_devtools.gyp:blink_generate_de vtools_grd', 11 '../../../third_party/WebKit/public/blink_devtools.gyp:blink_generate_de vtools_grd',
12 ], 12 ],
13 'variables': { 13 'variables': {
14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
15 }, 15 },
16 'actions': [ 16 'actions': [
17 { 17 {
18 'action_name': 'devtools_resources', 18 'action_name': 'devtools_resources',
19 # This can't use build/grit_action.gypi because the grd file 19 # This can't use build/grit_action.gypi because the grd file
20 # is generated at build time, so the trick of using grit_info to get 20 # is generated at build time, so the trick of using grit_info to get
21 # the real inputs/outputs at GYP time isn't possible. 21 # the real inputs/outputs at GYP time isn't possible.
22 'variables': { 22 'variables': {
23 'grit_cmd': ['python', '../../../tools/grit/grit.py'], 23 'grit_cmd': ['python', '../../../tools/grit/grit.py'],
24 'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resou rces.grd', 24 'grit_grd_file': '<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resou rces.grd',
25 'grit_rc_header_format%': '',
25 }, 26 },
26 'inputs': [ 27 'inputs': [
27 '<(grit_grd_file)', 28 '<(grit_grd_file)',
28 '<!@pymod_do_main(grit_info --inputs)', 29 '<!@pymod_do_main(grit_info --inputs)',
29 ], 30 ],
30 'outputs': [ 31 'outputs': [
31 '<(grit_out_dir)/grit/devtools_resources.h', 32 '<(grit_out_dir)/grit/devtools_resources.h',
32 '<(grit_out_dir)/devtools_resources.pak', 33 '<(grit_out_dir)/devtools_resources.pak',
33 '<(grit_out_dir)/grit/devtools_resources_map.cc', 34 '<(grit_out_dir)/grit/devtools_resources_map.cc',
34 '<(grit_out_dir)/grit/devtools_resources_map.h', 35 '<(grit_out_dir)/grit/devtools_resources_map.h',
35 ], 36 ],
36 'action': ['<@(grit_cmd)', 37 'action': ['<@(grit_cmd)',
37 '-i', '<(grit_grd_file)', 'build', 38 '-i', '<(grit_grd_file)', 'build',
38 '-f', '<(DEPTH)/tools/gritsettings/resource_ids', 39 '-f', '<(DEPTH)/tools/gritsettings/resource_ids',
39 '-o', '<(grit_out_dir)', 40 '-o', '<(grit_out_dir)',
40 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)', 41 '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
41 '<@(grit_defines)' ], 42 '<@(grit_defines)',
43 '<@(grit_rc_header_format)'],
42 'message': 'Generating resources from <(grit_grd_file)', 44 'message': 'Generating resources from <(grit_grd_file)',
43 }, 45 },
44 { 46 {
45 'action_name': 'devtools_protocol_constants', 47 'action_name': 'devtools_protocol_constants',
46 'variables': { 48 'variables': {
47 'blink_protocol': '../../../third_party/WebKit/Source/devtools/proto col.json', 49 'blink_protocol': '../../../third_party/WebKit/Source/devtools/proto col.json',
48 'browser_protocol': 'browser_protocol.json' 50 'browser_protocol': 'browser_protocol.json'
49 }, 51 },
50 'inputs': [ 52 'inputs': [
51 '<(blink_protocol)', 53 '<(blink_protocol)',
(...skipping 17 matching lines...) Expand all
69 ], 71 ],
70 'direct_dependent_settings': { 72 'direct_dependent_settings': {
71 'include_dirs': [ 73 'include_dirs': [
72 '<(SHARED_INTERMEDIATE_DIR)', 74 '<(SHARED_INTERMEDIATE_DIR)',
73 ] 75 ]
74 }, 76 },
75 'includes': [ '../../../build/grit_target.gypi' ], 77 'includes': [ '../../../build/grit_target.gypi' ],
76 }, 78 },
77 ], 79 ],
78 } 80 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/tracing/tracing_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698