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

Side by Side Diff: build/gyp_chromium

Issue 2107018: Fix ChromiumOS build (it still has circular dependencies). (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 7 months 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # This script is wrapper for Chromium that adds some support for how GYP 7 # This script is wrapper for Chromium that adds some support for how GYP
8 # is invoked by Chromium beyond what can be done in the gclient hooks. 8 # is invoked by Chromium beyond what can be done in the gclient hooks.
9 9
10 import glob 10 import glob
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 args.extend(['-I' + i for i in additional_include_files(args)]) 73 args.extend(['-I' + i for i in additional_include_files(args)])
74 74
75 # There shouldn't be a circular dependency relationship between .gyp files, 75 # There shouldn't be a circular dependency relationship between .gyp files,
76 # but in Chromium's .gyp files, on non-Mac platforms, circular relationships 76 # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
77 # currently exist. The check for circular dependencies is currently 77 # currently exist. The check for circular dependencies is currently
78 # bypassed on other platforms, but is left enabled on the Mac, where a 78 # bypassed on other platforms, but is left enabled on the Mac, where a
79 # violation of the rule causes Xcode to misbehave badly. 79 # violation of the rule causes Xcode to misbehave badly.
80 # TODO(mark): Find and kill remaining circular dependencies, and remove this 80 # TODO(mark): Find and kill remaining circular dependencies, and remove this
81 # option. http://crbug.com/35878. 81 # option. http://crbug.com/35878.
82 if sys.platform not in ('darwin', 'linux2'): 82 # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the
83 # list.
84 if sys.platform not in ('darwin',):
83 args.append('--no-circular-check') 85 args.append('--no-circular-check')
84 86
85 # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check 87 # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check
86 # to enfore syntax checking. 88 # to enfore syntax checking.
87 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') 89 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
88 if syntax_check and int(syntax_check): 90 if syntax_check and int(syntax_check):
89 args.append('--check') 91 args.append('--check')
90 92
91 print 'Updating projects from gyp files...' 93 print 'Updating projects from gyp files...'
92 sys.stdout.flush() 94 sys.stdout.flush()
93 95
94 # Off we go... 96 # Off we go...
95 sys.exit(gyp.main(args)) 97 sys.exit(gyp.main(args))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698