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

Side by Side Diff: chrome/chrome.gyp

Issue 487003: remove chromeos dependency from linux_view (Closed)
Patch Set: " Created 11 years 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
« no previous file with comments | « chrome/browser/views/dialog_stubs_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 # One alternative would be to turn this into several actions, 155 # One alternative would be to turn this into several actions,
156 # but that would be rather verbose. 156 # but that would be rather verbose.
157 ], 157 ],
158 'action': ['python', '../tools/grit/grit.py', '-i', 158 'action': ['python', '../tools/grit/grit.py', '-i',
159 '<(RULE_INPUT_PATH)', 159 '<(RULE_INPUT_PATH)',
160 'build', '-o', '<(grit_out_dir)', 160 'build', '-o', '<(grit_out_dir)',
161 '-D', '<(chrome_build)', 161 '-D', '<(chrome_build)',
162 '-E', '<(branded_env)', 162 '-E', '<(branded_env)',
163 ], 163 ],
164 'conditions': [ 164 'conditions': [
165 ['chromeos==1 or toolkit_views==1', { 165 ['chromeos==1', {
166 'action': ['-D', 'chromeos'], 166 'action': ['-D', 'chromeos'],
167 }], 167 }],
168 ['use_titlecase_in_grd_files==1', { 168 ['use_titlecase_in_grd_files==1', {
169 'action': ['-D', 'use_titlecase'], 169 'action': ['-D', 'use_titlecase'],
170 }], 170 }],
171 ], 171 ],
172 'message': 'Generating resources from <(RULE_INPUT_PATH)', 172 'message': 'Generating resources from <(RULE_INPUT_PATH)',
173 }, 173 },
174 ], 174 ],
175 'sources': [ 175 'sources': [
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOC ALE.pak\' <(locales))', 239 '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOC ALE.pak\' <(locales))',
240 # TODO(bradnelson): move to something like this 240 # TODO(bradnelson): move to something like this
241 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_string s_grds))', 241 #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_string s_grds))',
242 # See comment in chrome_resources as to why. 242 # See comment in chrome_resources as to why.
243 ], 243 ],
244 'action': ['python', '../tools/grit/grit.py', '-i', 244 'action': ['python', '../tools/grit/grit.py', '-i',
245 '<(RULE_INPUT_PATH)', 245 '<(RULE_INPUT_PATH)',
246 'build', '-o', '<(grit_out_dir)', 246 'build', '-o', '<(grit_out_dir)',
247 '-D', '<(chrome_build)'], 247 '-D', '<(chrome_build)'],
248 'conditions': [ 248 'conditions': [
249 ['chromeos==1 or toolkit_views==1', { 249 ['chromeos==1', {
250 'action': ['-D', 'chromeos'], 250 'action': ['-D', 'chromeos'],
251 }], 251 }],
252 ['use_titlecase_in_grd_files==1', { 252 ['use_titlecase_in_grd_files==1', {
253 'action': ['-D', 'use_titlecase'], 253 'action': ['-D', 'use_titlecase'],
254 }], 254 }],
255 ], 255 ],
256 'message': 'Generating resources from <(RULE_INPUT_PATH)', 256 'message': 'Generating resources from <(RULE_INPUT_PATH)',
257 }, 257 },
258 ], 258 ],
259 'sources': [ 259 'sources': [
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 'outputs': [ 296 'outputs': [
297 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', 297 '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
298 ], 298 ],
299 'action': [ 299 'action': [
300 'python', '<(grit_path)', 300 'python', '<(grit_path)',
301 '-i', '<(input_path)', 'build', 301 '-i', '<(input_path)', 'build',
302 '-o', '<(grit_out_dir)', 302 '-o', '<(grit_out_dir)',
303 '-D', '<(chrome_build)' 303 '-D', '<(chrome_build)'
304 ], 304 ],
305 'conditions': [ 305 'conditions': [
306 ['chromeos==1 or toolkit_views==1', { 306 ['chromeos==1', {
307 'action': ['-D', 'chromeos'], 307 'action': ['-D', 'chromeos'],
308 }], 308 }],
309 ['use_titlecase_in_grd_files==1', { 309 ['use_titlecase_in_grd_files==1', {
310 'action': ['-D', 'use_titlecase'], 310 'action': ['-D', 'use_titlecase'],
311 }], 311 }],
312 ], 312 ],
313 'message': 'Generating resources from <(input_path)', 313 'message': 'Generating resources from <(input_path)',
314 }, 314 },
315 ], 315 ],
316 'direct_dependent_settings': { 316 'direct_dependent_settings': {
(...skipping 2406 matching lines...) Expand 10 before | Expand all | Expand 10 after
2723 }], # targets 2723 }], # targets
2724 }], # OS=="linux" or OS=="freebsd" 2724 }], # OS=="linux" or OS=="freebsd"
2725 ], # 'conditions' 2725 ], # 'conditions'
2726 } 2726 }
2727 2727
2728 # Local Variables: 2728 # Local Variables:
2729 # tab-width:2 2729 # tab-width:2
2730 # indent-tabs-mode:nil 2730 # indent-tabs-mode:nil
2731 # End: 2731 # End:
2732 # vim: set expandtab tabstop=2 shiftwidth=2: 2732 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/views/dialog_stubs_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698