Index: build/mac_toolchain.py |
diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py |
index 44ea7e6c1985a670d4854bb1943f89e08ec53f55..5728ab5e98f1253576a27b22c591a23f1652089b 100755 |
--- a/build/mac_toolchain.py |
+++ b/build/mac_toolchain.py |
@@ -39,19 +39,6 @@ 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: |
@@ -151,7 +138,7 @@ def AcceptLicense(): |
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 |
@@ -167,8 +154,7 @@ 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 |