7 files changed, 3 insertions, 80 deletions
diff --git a/chromium/infra/scripts/legacy/scripts/slave/chromium/OWNERS b/chromium/infra/scripts/OWNERS
index 52faa91a969..52faa91a969 100644
--- a/chromium/infra/scripts/legacy/scripts/slave/chromium/OWNERS
+++ b/chromium/infra/scripts/OWNERS
diff --git a/chromium/infra/scripts/legacy/README b/chromium/infra/scripts/README
index a6b1e9e2b06..a6b1e9e2b06 100644
--- a/chromium/infra/scripts/legacy/README
+++ b/chromium/infra/scripts/README
diff --git a/chromium/infra/scripts/legacy/scripts/common/__init__.py b/chromium/infra/scripts/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/chromium/infra/scripts/legacy/scripts/common/__init__.py
+++ b/chromium/infra/scripts/__init__.py
diff --git a/chromium/infra/scripts/legacy/scripts/slave/build_directory.py b/chromium/infra/scripts/build_directory.py
index d0686f551c6..23847be2f5c 100644
--- a/chromium/infra/scripts/legacy/scripts/slave/build_directory.py
+++ b/chromium/infra/scripts/build_directory.py
@@ -51,12 +51,8 @@ def GetBuildOutputDirectory(src_dir=None, cros_board=None):
     return os.path.join(src_dir, out_dirname)
   assert not cros_board, "'cros_board' not supported on this platform"
 
-  if sys.platform == 'darwin':
-    if AreNinjaFilesNewerThanXcodeFiles(src_dir):
-      return os.path.join(src_dir, 'out')
-    return os.path.join(src_dir, 'xcodebuild')
-
-  if sys.platform == 'cygwin' or sys.platform.startswith('win'):
+  if sys.platform == 'cygwin' or sys.platform.startswith('win') or (
+      sys.platorm == 'darwin'):
     return os.path.join(src_dir, 'out')
 
   raise NotImplementedError('Unexpected platform %s' % sys.platform)
diff --git a/chromium/infra/scripts/legacy/scripts/common/chromium_utils.py b/chromium/infra/scripts/legacy/scripts/common/chromium_utils.py
deleted file mode 100644
index 20d838b12c9..00000000000
--- a/chromium/infra/scripts/legacy/scripts/common/chromium_utils.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.
-
-""" Set of basic operations/utilities that are used by the build. """
-
-from contextlib import contextmanager
-import ast
-import cStringIO
-import copy
-import errno
-import fnmatch
-import glob
-import json
-import os
-import re
-import shutil
-import socket
-import stat
-import subprocess
-import sys
-import threading
-import time
-import traceback
-
-
-BUILD_DIR = os.path.realpath(os.path.join(
-    os.path.dirname(__file__), os.pardir, os.pardir))
-
-
-# Local errors.
-class MissingArgument(Exception):
-  pass
-class PathNotFound(Exception):
-  pass
-class ExternalError(Exception):
-  pass
-
-def IsWindows():
-  return sys.platform == 'cygwin' or sys.platform.startswith('win')
-
-def IsLinux():
-  return sys.platform.startswith('linux')
-
-def IsMac():
-  return sys.platform.startswith('darwin')
-
-
-def convert_json(option, _, value, parser):
-  """Provide an OptionParser callback to unmarshal a JSON string."""
-  setattr(parser.values, option.dest, json.loads(value))
-
-
-def AddPropertiesOptions(option_parser):
-  """Registers command line options for parsing build and factory properties.
-
-  After parsing, the options object will have the 'build_properties' and
-  'factory_properties' attributes. The corresponding values will be python
-  dictionaries containing the properties. If the options are not given on
-  the command line, the dictionaries will be empty.
-
-  Args:
-    option_parser: An optparse.OptionParser to register command line options
-                   for build and factory properties.
-  """
-  option_parser.add_option('--build-properties', action='callback',
-                           callback=convert_json, type='string',
-                           nargs=1, default={},
-                           help='build properties in JSON format')
-  option_parser.add_option('--factory-properties', action='callback',
-                           callback=convert_json, type='string',
-                           nargs=1, default={},
-                           help='factory properties in JSON format')
diff --git a/chromium/infra/scripts/legacy/scripts/slave/__init__.py b/chromium/infra/scripts/legacy/scripts/slave/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/chromium/infra/scripts/legacy/scripts/slave/__init__.py
+++ /dev/null
diff --git a/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py b/chromium/infra/scripts/sizes.py
index 2b2d1f3ea04..0106772a131 100755
--- a/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
+++ b/chromium/infra/scripts/sizes.py
@@ -23,7 +23,7 @@ import subprocess
 import sys
 import tempfile
 
-from slave import build_directory
+import build_directory
 
 
 SRC_DIR = os.path.abspath(