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

Side by Side Diff: build/grit_action.gypi

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # This file is meant to be included into an action to invoke grit in a 5 # This file is meant to be included into an action to invoke grit in a
6 # consistent manner. To use this the following variables need to be 6 # consistent manner. To use this the following variables need to be
7 # defined: 7 # defined:
8 # grit_grd_file: string: grd file path 8 # grit_grd_file: string: grd file path
9 # grit_out_dir: string: the output directory path 9 # grit_out_dir: string: the output directory path
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 'grit_whitelist_flag': [], 43 'grit_whitelist_flag': [],
44 } 44 }
45 }, { 45 }, {
46 'variables': { 46 'variables': {
47 'grit_whitelist_flag': ['-w', '<(grit_whitelist)'], 47 'grit_whitelist_flag': ['-w', '<(grit_whitelist)'],
48 } 48 }
49 }] 49 }]
50 ], 50 ],
51 'inputs': [ 51 'inputs': [
52 '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) ' 52 '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) '
53 '--inputs <(grit_grd_file) -f "<(grit_resource_ids)")', 53 '<@(grit_whitelist_flag) --inputs <(grit_grd_file) '
54 '-f "<(grit_resource_ids)")',
54 ], 55 ],
55 'outputs': [ 56 'outputs': [
56 '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) ' 57 '<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) '
57 '--outputs \'<(grit_out_dir)\' ' 58 '<@(grit_whitelist_flag) --outputs \'<(grit_out_dir)\' '
58 '<(grit_grd_file) -f "<(grit_resource_ids)")', 59 '<(grit_grd_file) -f "<(grit_resource_ids)")',
59 ], 60 ],
60 'action': ['<@(grit_cmd)', 61 'action': ['<@(grit_cmd)',
61 '-i', '<(grit_grd_file)', 'build', 62 '-i', '<(grit_grd_file)', 'build',
62 '-f', '<(grit_resource_ids)', 63 '-f', '<(grit_resource_ids)',
63 '-o', '<(grit_out_dir)', 64 '-o', '<(grit_out_dir)',
64 '--write-only-new=<(write_only_new)', 65 '--write-only-new=<(write_only_new)',
65 '<@(grit_defines)', 66 '<@(grit_defines)',
66 '<@(grit_whitelist_flag)', 67 '<@(grit_whitelist_flag)',
67 '<@(grit_additional_defines)', 68 '<@(grit_additional_defines)',
68 '<@(grit_rc_header_format)'], 69 '<@(grit_rc_header_format)'],
69 'message': 'Generating resources from <(grit_grd_file)', 70 'message': 'Generating resources from <(grit_grd_file)',
70 } 71 }
OLDNEW
« no previous file with comments | « build/gn_migration.gypi ('k') | build/gyp_chromium » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698