diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 23:32:12 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 23:32:12 +0000 |
| commit | cc143a47a5a0fca931d148b76063cdebcf33cdf9 (patch) | |
| tree | bfc44c241d97895329c68e82b40497afaf4bd064 /build | |
| parent | 743ad0140836bf77168c53a20b06b12b8a807a0f (diff) | |
| download | chromium_src-cc143a47a5a0fca931d148b76063cdebcf33cdf9.zip chromium_src-cc143a47a5a0fca931d148b76063cdebcf33cdf9.tar.gz chromium_src-cc143a47a5a0fca931d148b76063cdebcf33cdf9.tar.bz2 | |
Revert "Move Chromoting strings to string_resources.grd and simplify remoting_resources target."
This reverts commit f5dfed801f9358411900c4f9ca58ef0a11cce9ae.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166069 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 ef67ab5..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, |