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

Unified Diff: remoting/remoting.gyp

Issue 11194022: Revert 162226 - Add common_resources.grd for non-localizeable chromoting resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/grit_action.gypi ('k') | remoting/resources/common_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
===================================================================
--- remoting/remoting.gyp (revision 162276)
+++ remoting/remoting.gyp (working copy)
@@ -1284,36 +1284,34 @@
],
'actions': [
{
- 'action_name': 'string_resources',
+ 'action_name': 'generate_resources',
'variables': {
- 'grit_grd_file': '<(strings_grd_file)',
- 'base_grit_grd_file': '<(base_strings_grd_file)',
+ 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
},
- 'includes': [ 'grit_action.gypi' ],
+ 'inputs': [
+ '<(strings_grd_file)',
+ '<(resource_ids_file)',
+ ],
+ 'outputs': [
+ '<!@pymod_do_main(grit_info <@(grit_defines) '
+ '--outputs \'<(grit_out_dir)\' <(base_strings_grd_file))',
+ ],
+ 'action': ['<@(grit_cmd)',
+ '-i', '<(strings_grd_file)', 'build',
+ '-fresource_ids',
+ '-o', '<(grit_out_dir)',
+ '<@(grit_defines)' ],
+ 'msvs_cygwin_shell': 0,
+ 'message': 'Generating resources from <(strings_grd_file)',
},
- {
- 'action_name': 'common_resources',
- 'variables': {
- 'grit_grd_file': 'resources/common_resources.grd',
- 'base_grit_grd_file': 'resources/common_resources.grd',
- },
- 'includes': [ 'grit_action.gypi' ],
- },
],
'copies': [
- # Copy results to the product directory.
- {
+ { # Copy results to the product directory.
'destination': '<(PRODUCT_DIR)/remoting_locales',
'files': [
'<(grit_out_dir)/remoting/resources/en-US.pak',
]
},
- {
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- '<(grit_out_dir)/remoting/resources/chrome_remote_desktop.pak',
- ]
- },
],
'includes': [ '../build/grit_target.gypi' ],
}, # end of target 'remoting_resources'
« no previous file with comments | « remoting/grit_action.gypi ('k') | remoting/resources/common_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698