Remove direct references to hermetic mac toolchain.

build/mac_toolchain.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Download necessary mac toolchain files under certain conditions.  If
 xcode-select is already set and points to an external folder
 (e.g. /Application/Xcode.app), this script only runs if the GYP_DEFINE
 |force_mac_toolchain| is set.  To override the values in
 |TOOLCHAIN_REVISION|-|TOOLCHAIN_SUB_REVISION| below, GYP_DEFINE
@@ skipping 21 matching lines @@
 TOOLCHAIN_REVISION = '5B1008'
 TOOLCHAIN_SUB_REVISION = 3
 TOOLCHAIN_VERSION = '%s-%s' % (TOOLCHAIN_REVISION, TOOLCHAIN_SUB_REVISION)
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 TOOLCHAIN_BUILD_DIR = os.path.join(BASE_DIR, 'mac_files', 'Xcode.app')
 STAMP_FILE = os.path.join(BASE_DIR, 'mac_files', 'toolchain_build_revision')
 TOOLCHAIN_URL = 'gs://chrome-mac-sdk/'
 
 
-def GetToolchainDirectory():
-  if sys.platform == 'darwin' and not UseLocalMacSDK():
-    return TOOLCHAIN_BUILD_DIR
-  else:
-    return None
-
-
-def SetToolchainEnvironment():
-  mac_toolchain_dir = GetToolchainDirectory()
-  if mac_toolchain_dir:
-    os.environ['DEVELOPER_DIR'] = mac_toolchain_dir
-
-
 def ReadStampFile():
   """Return the contents of the stamp file, or '' if it doesn't exist."""
   try:
     with open(STAMP_FILE, 'r') as f:
       return f.read().rstrip()
   except IOError:
     return ''
 
 
 def WriteStampFile(s):
@@ skipping 79 matching lines @@
   old_path = subprocess.Popen(['/usr/bin/xcode-select', '-p'],
                                stdout=subprocess.PIPE).communicate()[0].strip()
   try:
     build_dir = os.path.join(TOOLCHAIN_BUILD_DIR, 'Contents/Developer')
     subprocess.check_call(['sudo', '/usr/bin/xcode-select', '-s', build_dir])
     subprocess.check_call(['sudo', '/usr/bin/xcodebuild', '-license', 'accept'])
   finally:
     subprocess.check_call(['sudo', '/usr/bin/xcode-select', '-s', old_path])
 
 
-def UseLocalMacSDK():
+def _UseLocalMacSDK():
   force_pull = os.environ.has_key('FORCE_MAC_TOOLCHAIN')
 
   # Don't update the toolchain if there's already one installed outside of the
   # expected location for a Chromium mac toolchain, unless |force_pull| is set.
   proc = subprocess.Popen(['xcode-select', '-p'], stdout=subprocess.PIPE)
   xcode_select_dir = proc.communicate()[0]
   rc = proc.returncode
   return (not force_pull and rc == 0 and
           TOOLCHAIN_BUILD_DIR not in xcode_select_dir)
 
 
 def main():
   if sys.platform != 'darwin':
     return 0
 
-  # TODO(justincohen): Add support for GN per crbug.com/570091
-  if UseLocalMacSDK():
+  if _UseLocalMacSDK():
     print 'Using local toolchain.'
     return 0
 
   toolchain_revision = os.environ.get('MAC_TOOLCHAIN_REVISION',
                                       TOOLCHAIN_VERSION)
   if ReadStampFile() == toolchain_revision:
     print 'Toolchain (%s) is already up to date.' % toolchain_revision
     AcceptLicense()
     return 0
 
@@ skipping 18 matching lines @@
     WriteStampFile(toolchain_revision)
     return 0
   except Exception as e:
     print 'Failed to download toolchain %s.' % toolchain_file
     print 'Exception %s' % e
     print 'Exiting.'
     return 1
 
 if __name__ == '__main__':
   sys.exit(main())