Revert of Simplify landmines code a bit now that all branches of all platforms are on ninja

build/landmines.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This script runs every build as the first hook (See DEPS). If it detects that
 the build should be clobbered, it will delete the contents of the build
 directory.
 
 A landmine is tripped when a builder checks out a different revision, and the
 diff between the new landmines and the old ones is non-null. At this point, the
 build is clobbered.
 """
 
 import difflib
 import errno
 import gyp_environment
 import logging
 import optparse
 import os
 import sys
 import subprocess
 import time
 
 import clobber
 import landmine_utils
 
 
-def get_build_dir(src_dir):
+def get_build_dir(build_tool, src_dir, is_iphone=False):
   """
   Returns output directory absolute path dependent on build and targets.
   Examples:
     r'c:\b\build\slave\win\build\src\out'
     '/mnt/data/b/build/slave/linux/build/src/out'
-    '/b/build/slave/ios_rel_device/build/src/out'
+    '/b/build/slave/ios_rel_device/build/src/xcodebuild'
 
   Keep this function in sync with tools/build/scripts/slave/compile.py
   """
-  if 'CHROMIUM_OUT_DIR' in os.environ:
-    output_dir = os.environ.get('CHROMIUM_OUT_DIR').strip()
-    if not output_dir:
-      raise Error('CHROMIUM_OUT_DIR environment variable is set but blank!')
+  ret = None
+  if build_tool == 'xcode':
+    ret = os.path.join(src_dir, 'xcodebuild')
+  elif build_tool in ['make', 'ninja', 'ninja-ios']:  # TODO: Remove ninja-ios.
+    if 'CHROMIUM_OUT_DIR' in os.environ:
+      output_dir = os.environ.get('CHROMIUM_OUT_DIR').strip()
+      if not output_dir:
+        raise Error('CHROMIUM_OUT_DIR environment variable is set but blank!')
+    else:
+      output_dir = landmine_utils.gyp_generator_flags().get('output_dir', 'out')
+    ret = os.path.join(src_dir, output_dir)
   else:
-    output_dir = landmine_utils.gyp_generator_flags().get('output_dir', 'out')
-  return os.path.abspath(os.path.join(src_dir, output_dir))
+    raise NotImplementedError('Unexpected GYP_GENERATORS (%s)' % build_tool)
+  return os.path.abspath(ret)
 
 
 def clobber_if_necessary(new_landmines, src_dir):
   """Does the work of setting, planting, and triggering landmines."""
-  out_dir = get_build_dir(src_dir)
+  out_dir = get_build_dir(landmine_utils.builder(), src_dir)
   landmines_path = os.path.normpath(os.path.join(src_dir, '.landmines'))
   try:
     os.makedirs(out_dir)
   except OSError as e:
     if e.errno == errno.EEXIST:
       pass
 
   if os.path.exists(landmines_path):
     with open(landmines_path, 'r') as f:
       old_landmines = f.readlines()
@@ skipping 53 matching lines @@
   extra_script = os.environ.get('EXTRA_LANDMINES_SCRIPT')
   if extra_script:
     options.landmine_scripts += [extra_script]
 
   return options
 
 
 def main():
   options = process_options()
 
+  if landmine_utils.builder() in ('dump_dependency_json', 'eclipse'):
+    return 0
+
   gyp_environment.SetEnvironment()
 
   landmines = []
   for s in options.landmine_scripts:
     proc = subprocess.Popen([sys.executable, s], stdout=subprocess.PIPE)
     output, _ = proc.communicate()
     landmines.extend([('%s\n' % l.strip()) for l in output.splitlines()])
   clobber_if_necessary(landmines, options.src_dir)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())