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

Side by Side Diff: build/gyp_chromium

Issue 1106283004: Disable circular gyp dependency check on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/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 argparse 10 import argparse
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 256
257 # There shouldn't be a circular dependency relationship between .gyp files, 257 # There shouldn't be a circular dependency relationship between .gyp files,
258 # but in Chromium's .gyp files, on non-Mac platforms, circular relationships 258 # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
259 # currently exist. The check for circular dependencies is currently 259 # currently exist. The check for circular dependencies is currently
260 # bypassed on other platforms, but is left enabled on the Mac, where a 260 # bypassed on other platforms, but is left enabled on the Mac, where a
261 # violation of the rule causes Xcode to misbehave badly. 261 # violation of the rule causes Xcode to misbehave badly.
262 # TODO(mark): Find and kill remaining circular dependencies, and remove this 262 # TODO(mark): Find and kill remaining circular dependencies, and remove this
263 # option. http://crbug.com/35878. 263 # option. http://crbug.com/35878.
264 # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the 264 # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the
265 # list. 265 # list.
266 if sys.platform not in ('darwin',): 266 #if sys.platform not in ('darwin',):
Fady Samuel 2015/04/28 22:33:04 Should I remove this and add to the TODOs above?
267 args.append('--no-circular-check') 267 args.append('--no-circular-check')
268 268
269 # We explicitly don't support the make gyp generator (crbug.com/348686). Be 269 # We explicitly don't support the make gyp generator (crbug.com/348686). Be
270 # nice and fail here, rather than choking in gyp. 270 # nice and fail here, rather than choking in gyp.
271 if re.search(r'(^|,|\s)make($|,|\s)', os.environ.get('GYP_GENERATORS', '')): 271 if re.search(r'(^|,|\s)make($|,|\s)', os.environ.get('GYP_GENERATORS', '')):
272 print 'Error: make gyp generator not supported (check GYP_GENERATORS).' 272 print 'Error: make gyp generator not supported (check GYP_GENERATORS).'
273 sys.exit(1) 273 sys.exit(1)
274 274
275 # We explicitly don't support the native msvs gyp generator. Be nice and 275 # We explicitly don't support the native msvs gyp generator. Be nice and
276 # fail here, rather than generating broken projects. 276 # fail here, rather than generating broken projects.
277 if re.search(r'(^|,|\s)msvs($|,|\s)', os.environ.get('GYP_GENERATORS', '')): 277 if re.search(r'(^|,|\s)msvs($|,|\s)', os.environ.get('GYP_GENERATORS', '')):
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 if not use_analyzer: 324 if not use_analyzer:
325 vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() 325 vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
326 if vs2013_runtime_dll_dirs: 326 if vs2013_runtime_dll_dirs:
327 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs 327 x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
328 vs_toolchain.CopyVsRuntimeDlls( 328 vs_toolchain.CopyVsRuntimeDlls(
329 os.path.join(chrome_src, GetOutputDirectory()), 329 os.path.join(chrome_src, GetOutputDirectory()),
330 (x86_runtime, x64_runtime)) 330 (x86_runtime, x64_runtime))
331 331
332 sys.exit(gyp_rc) 332 sys.exit(gyp_rc)
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