summaryrefslogtreecommitdiffstats
path: root/build/grit_action.gypi
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-06 03:39:19 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-06 03:39:19 +0000
commit4f863d9384a374d120bd1b2c6be12b3b32112820 (patch)
tree7d62806467a4976e25149752a1ec57cb3b261967 /build/grit_action.gypi
parentff1af58133f464388b7ad8d8b98548626e153986 (diff)
downloadchromium_src-4f863d9384a374d120bd1b2c6be12b3b32112820.zip
chromium_src-4f863d9384a374d120bd1b2c6be12b3b32112820.tar.gz
chromium_src-4f863d9384a374d120bd1b2c6be12b3b32112820.tar.bz2
Move Chromoting strings to string_resources.grd and simplify remoting_resources target.
Previously all strings were in messages.json files. Moving them to GRD file will allow to share them with native components. Also simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://chromiumcodereview.appspot.com/11275101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/grit_action.gypi')
-rw-r--r--build/grit_action.gypi9
1 files changed, 6 insertions, 3 deletions
diff --git a/build/grit_action.gypi b/build/grit_action.gypi
index 0f0d779..ef67ab5 100644
--- a/build/grit_action.gypi
+++ b/build/grit_action.gypi
@@ -16,16 +16,19 @@
{
'variables': {
'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
+ 'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids',
},
'inputs': [
- '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file))',
+ '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file) '
+ '-f "<(grit_resource_ids)")',
],
'outputs': [
- '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
+ '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' '
+ '<(grit_grd_file) -f "<(grit_resource_ids)")',
],
'action': ['<@(grit_cmd)',
'-i', '<(grit_grd_file)', 'build',
- '-fGRIT_DIR/../gritsettings/resource_ids',
+ '-f<(grit_resource_ids)',
'-o', '<(grit_out_dir)',
'<@(grit_defines)' ],
'msvs_cygwin_shell': 0,