diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 20:17:54 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 20:17:54 +0000 |
| commit | 1b970e1d5f613e36f6751164d236c05fddc85398 (patch) | |
| tree | 58e5200c76ad0b1983a0b227af532d318de602c1 /build | |
| parent | 8340556be735e45872f4928d8c7c3a9ccda37227 (diff) | |
| download | chromium_src-1b970e1d5f613e36f6751164d236c05fddc85398.zip chromium_src-1b970e1d5f613e36f6751164d236c05fddc85398.tar.gz chromium_src-1b970e1d5f613e36f6751164d236c05fddc85398.tar.bz2 | |
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: svn://svn.chromium.org/chrome/trunk/src@166013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/grit_action.gypi | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/build/grit_action.gypi b/build/grit_action.gypi index af1b4d7..0f0d779 100644 --- a/build/grit_action.gypi +++ b/build/grit_action.gypi @@ -16,19 +16,16 @@ { '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) ' - '-f "<(grit_resource_ids)")', + '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file))', ], 'outputs': [ - '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' ' - '<(grit_grd_file) -f "<(grit_resource_ids)")', + '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))', ], 'action': ['<@(grit_cmd)', '-i', '<(grit_grd_file)', 'build', - '-f', '<(grit_resource_ids)', + '-fGRIT_DIR/../gritsettings/resource_ids', '-o', '<(grit_out_dir)', '<@(grit_defines)' ], 'msvs_cygwin_shell': 0, |