summaryrefslogtreecommitdiffstats
path: root/build/landmines.py
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-11 19:13:21 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-11 19:13:21 +0000
commitddca2f72cf9bc609ca769fa927a29392d057ca4c (patch)
tree76ccc086d73c2da4fcb862a25906ed5ba4f69035 /build/landmines.py
parente22eb93b9b55b143795cc5223a362d091d37c7d9 (diff)
downloadchromium_src-ddca2f72cf9bc609ca769fa927a29392d057ca4c.zip
chromium_src-ddca2f72cf9bc609ca769fa927a29392d057ca4c.tar.gz
chromium_src-ddca2f72cf9bc609ca769fa927a29392d057ca4c.tar.bz2
Teach landmines script that Linux now uses ninja by default.
Mostly for documentation purposes. It'll also uselessly cause a clobber. BUG=239257 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14940023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/landmines.py')
-rwxr-xr-xbuild/landmines.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/build/landmines.py b/build/landmines.py
index edb1bbd..40177ea 100755
--- a/build/landmines.py
+++ b/build/landmines.py
@@ -47,7 +47,7 @@ def memoize(default=None):
@memoize()
def IsWindows():
- return sys.platform.startswith('win') or sys.platform == 'cygwin'
+ return sys.platform in ['win32', 'cygwin']
@memoize()
@@ -57,7 +57,7 @@ def IsLinux():
@memoize()
def IsMac():
- return sys.platform.startswith('darwin')
+ return sys.platform == 'darwin'
@memoize()
@@ -123,7 +123,7 @@ def builder():
elif IsWindows():
return 'msvs'
elif IsLinux():
- return 'make'
+ return 'ninja'
elif IsMac():
return 'xcode'
else:
@@ -167,9 +167,7 @@ def get_target_build_dir(build_tool, target, is_iphone=False):
if build_tool == 'xcode':
ret = os.path.join(SRC_DIR, 'xcodebuild',
target + ('-iphoneos' if is_iphone else ''))
- elif build_tool == 'make':
- ret = os.path.join(SRC_DIR, 'out', target)
- elif build_tool in ['ninja', 'ninja-ios']:
+ elif build_tool in ['make', 'ninja', 'ninja-ios']: # TODO: Remove ninja-ios.
ret = os.path.join(SRC_DIR, 'out', target)
elif build_tool in ['msvs', 'vs', 'ib']:
ret = os.path.join(SRC_DIR, 'build', target)