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

Side by Side Diff: build/gyp_chromium

Issue 7104114: Remove features_override.gypi. Currently, it matches the values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « build/features_override.gypi ('k') | 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/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2011 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 specified_includes = set() 81 specified_includes = set()
82 for arg in args: 82 for arg in args:
83 if arg.startswith('-I') and len(arg) > 2: 83 if arg.startswith('-I') and len(arg) > 2:
84 specified_includes.add(os.path.realpath(arg[2:])) 84 specified_includes.add(os.path.realpath(arg[2:]))
85 85
86 result = [] 86 result = []
87 def AddInclude(path): 87 def AddInclude(path):
88 if os.path.realpath(path) not in specified_includes: 88 if os.path.realpath(path) not in specified_includes:
89 result.append(path) 89 result.append(path)
90 90
91 # Always include common.gypi & features_override.gypi 91 # Always include common.gypi.
92 AddInclude(os.path.join(script_dir, 'common.gypi')) 92 AddInclude(os.path.join(script_dir, 'common.gypi'))
93 AddInclude(os.path.join(script_dir, 'features_override.gypi'))
94 93
95 # Optionally add supplemental .gypi files if present. 94 # Optionally add supplemental .gypi files if present.
96 supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) 95 supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))
97 for supplement in supplements: 96 for supplement in supplements:
98 AddInclude(supplement) 97 AddInclude(supplement)
99 98
100 return result 99 return result
101 100
102 if __name__ == '__main__': 101 if __name__ == '__main__':
103 args = sys.argv[1:] 102 args = sys.argv[1:]
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 # to enfore syntax checking. 161 # to enfore syntax checking.
163 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') 162 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
164 if syntax_check and int(syntax_check): 163 if syntax_check and int(syntax_check):
165 args.append('--check') 164 args.append('--check')
166 165
167 print 'Updating projects from gyp files...' 166 print 'Updating projects from gyp files...'
168 sys.stdout.flush() 167 sys.stdout.flush()
169 168
170 # Off we go... 169 # Off we go...
171 sys.exit(gyp.main(args)) 170 sys.exit(gyp.main(args))
OLDNEW
« no previous file with comments | « build/features_override.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698