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

Unified Diff: build/landmine_utils.py

Issue 2071463002: Simplify landmines code a bit now that all branches of all platforms are on ninja (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for reland Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/get_landmines.py ('k') | build/landmines.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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!'
« no previous file with comments | « build/get_landmines.py ('k') | build/landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698