Revert 166003 - 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://codereview.chromium.org/11275101

TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11365095

git-svn-id: http://src.chromium.org/svn/trunk/src/build@166013 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
sergeyu@chromium.org 2012-11-05 20:17:54 +00:00
Родитель 34f1df4e5e
Коммит 0e2ccdaa18
1 изменённых файлов: 3 добавлений и 6 удалений

Просмотреть файл

@ -16,19 +16,16 @@
{ {
'variables': { 'variables': {
'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'], 'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids',
}, },
'inputs': [ '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': [ 'outputs': [
'<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' ' '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
'<(grit_grd_file) -f "<(grit_resource_ids)")',
], ],
'action': ['<@(grit_cmd)', 'action': ['<@(grit_cmd)',
'-i', '<(grit_grd_file)', 'build', '-i', '<(grit_grd_file)', 'build',
'-f', '<(grit_resource_ids)', '-fGRIT_DIR/../gritsettings/resource_ids',
'-o', '<(grit_out_dir)', '-o', '<(grit_out_dir)',
'<@(grit_defines)' ], '<@(grit_defines)' ],
'msvs_cygwin_shell': 0, 'msvs_cygwin_shell': 0,