| Index: build/landmine_utils.py
|
| diff --git a/build/landmine_utils.py b/build/landmine_utils.py
|
| index 6d18b6d0f32d49309f3f498e779a5f2daf4b4eab..ef949d72af56352e12f635624bca481e14c5ea34 100644
|
| --- a/build/landmine_utils.py
|
| +++ b/build/landmine_utils.py
|
| @@ -47,27 +47,27 @@ def gyp_defines():
|
| return dict(arg.split('=', 1)
|
| for arg in shlex.split(os.environ.get('GYP_DEFINES', '')))
|
|
|
| +
|
| @memoize()
|
| def gyp_generator_flags():
|
| """Parses and returns GYP_GENERATOR_FLAGS env var as a dictionary."""
|
| return dict(arg.split('=', 1)
|
| for arg in shlex.split(os.environ.get('GYP_GENERATOR_FLAGS', '')))
|
|
|
| +
|
| @memoize()
|
| def gyp_msvs_version():
|
| return os.environ.get('GYP_MSVS_VERSION', '')
|
|
|
| +
|
| @memoize()
|
| def distributor():
|
| """
|
| Returns a string which is the distributed build engine in use (if any).
|
| - Possible values: 'goma', 'ib', ''
|
| + Possible values: 'goma', None
|
| """
|
| if 'goma' in gyp_defines():
|
| return 'goma'
|
| - elif IsWindows():
|
| - if 'CHROME_HEADLESS' in os.environ:
|
| - return 'ib' # use (win and !goma and headless) as approximation of ib
|
|
|
|
|
| @memoize()
|
| @@ -87,34 +87,3 @@ def platform():
|
| return 'linux'
|
| else:
|
| return 'mac'
|
| -
|
| -
|
| -@memoize()
|
| -def builder():
|
| - """
|
| - Returns a string representing the build engine (not compiler) to use.
|
| - Possible values: 'make', 'ninja', 'xcode', 'msvs', 'scons'
|
| - """
|
| - if 'GYP_GENERATORS' in os.environ:
|
| - # for simplicity, only support the first explicit generator
|
| - generator = os.environ['GYP_GENERATORS'].split(',')[0]
|
| - if generator.endswith('-android'):
|
| - return generator.split('-')[0]
|
| - elif generator.endswith('-ninja'):
|
| - return 'ninja'
|
| - else:
|
| - return generator
|
| - else:
|
| - if platform() == 'android':
|
| - # Good enough for now? Do any android bots use make?
|
| - return 'ninja'
|
| - elif platform() == 'ios':
|
| - return 'xcode'
|
| - elif IsWindows():
|
| - return 'ninja'
|
| - elif IsLinux():
|
| - return 'ninja'
|
| - elif IsMac():
|
| - return 'ninja'
|
| - else:
|
| - assert False, 'Don\'t know what builder we\'re using!'
|
|
|