Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: remoting/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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/base/resources_unittest.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This file is mostly a copy of base/grit_action.gypi . There are two 5 # This file is mostly a copy of base/grit_action.gypi . There are two
6 # differences: 6 # differences:
7 # 1. Remoting resources are build with a different resource_ids file. 7 # 1. Remoting resources are build with a different resource_ids file.
8 # 2. File specified by variable base_grit_grd_file is used to generate list of 8 # 2. File specified by variable base_grit_grd_file is used to generate list of
9 # inputs and outputs. 9 # inputs and outputs.
10 10
(...skipping 12 matching lines...) Expand all
23 '--outputs \'<(grit_out_dir)\' <(base_grit_grd_file) -fresource_ids)', 23 '--outputs \'<(grit_out_dir)\' <(base_grit_grd_file) -fresource_ids)',
24 ], 24 ],
25 'action': ['<@(grit_cmd)', 25 'action': ['<@(grit_cmd)',
26 '-i', '<(grit_grd_file)', 'build', 26 '-i', '<(grit_grd_file)', 'build',
27 '-fresource_ids', 27 '-fresource_ids',
28 '-o', '<(grit_out_dir)', 28 '-o', '<(grit_out_dir)',
29 '<@(grit_defines)' ], 29 '<@(grit_defines)' ],
30 'msvs_cygwin_shell': 0, 30 'msvs_cygwin_shell': 0,
31 'message': 'Generating resources from <(grit_grd_file)', 31 'message': 'Generating resources from <(grit_grd_file)',
32 } 32 }
OLDNEW
« no previous file with comments | « remoting/base/resources_unittest.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698