build/grit_action.gypi - Issue 11359035: Revert 165605 - Fix branding in chromoting string resources.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/grit_action.gypi

Issue 11359035: Revert 165605 - Fix branding in chromoting string resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/grit_action.gypi

===================================================================

--- build/grit_action.gypi (revision 165610)

+++ build/grit_action.gypi (working copy)

@@ -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,

« no previous file with comments | « no previous file | remoting/base/resources_unittest.cc » ('j') | no next file with comments »