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

Side by Side Diff: build/gyp_chromium

Issue 140123003: Escape 'gomadir' for GN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « 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/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 if i[0] in vars_dict and vars_dict[i[0]] == i[1]: 200 if i[0] in vars_dict and vars_dict[i[0]] == i[1]:
201 gn_args += ' ' + i[2] 201 gn_args += ' ' + i[2]
202 202
203 # These string arguments get passed directly as GN strings. 203 # These string arguments get passed directly as GN strings.
204 for v in ['android_src', 'windows_sdk_path', 'arm_float_abi']: 204 for v in ['android_src', 'windows_sdk_path', 'arm_float_abi']:
205 if v in vars_dict: 205 if v in vars_dict:
206 gn_args += ' ' + v + '=' + EscapeStringForGN(vars_dict[v]) 206 gn_args += ' ' + v + '=' + EscapeStringForGN(vars_dict[v])
207 207
208 # gomadir is renamed goma_dir in the GN build. 208 # gomadir is renamed goma_dir in the GN build.
209 if 'gomadir' in vars_dict: 209 if 'gomadir' in vars_dict:
210 gn_args += ' goma_dir="%s"' % vars_dict['gomadir'] 210 gn_args += ' goma_dir=%s' % EscapeStringForGN(vars_dict['gomadir'])
211 211
212 # These arguments get passed directly as integers (avoiding the quoting and 212 # These arguments get passed directly as integers (avoiding the quoting and
213 # escaping of the string ones above). 213 # escaping of the string ones above).
214 for v in ['arm_version']: 214 for v in ['arm_version']:
215 if v in vars_dict: 215 if v in vars_dict:
216 gn_args += ' %s=%s' % (v, vars_dict[v]) 216 gn_args += ' %s=%s' % (v, vars_dict[v])
217 217
218 # Some other flags come from GYP environment variables. 218 # Some other flags come from GYP environment variables.
219 gyp_msvs_version = os.environ.get('GYP_MSVS_VERSION', '') 219 gyp_msvs_version = os.environ.get('GYP_MSVS_VERSION', '')
220 if gyp_msvs_version: 220 if gyp_msvs_version:
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 if not RunGN(supplemental_includes): 399 if not RunGN(supplemental_includes):
400 sys.exit(1) 400 sys.exit(1)
401 args.extend( 401 args.extend(
402 ['-I' + i for i in additional_include_files(supplemental_includes, args)]) 402 ['-I' + i for i in additional_include_files(supplemental_includes, args)])
403 403
404 print 'Updating projects from gyp files...' 404 print 'Updating projects from gyp files...'
405 sys.stdout.flush() 405 sys.stdout.flush()
406 406
407 # Off we go... 407 # Off we go...
408 sys.exit(gyp.main(args)) 408 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