Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: build/mac_toolchain.py

Issue 2412353003: Remove direct references to hermetic mac toolchain. (Closed)
Patch Set: Remove unused import. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698