Commit 5654182d authored by Sergey Berezin's avatar Sergey Berezin Committed by Commit Bot

Replace hermetic Xcode installation with CIPD-based flow (take 2)

The 'API' to the scripts remains the same, only the delivery mechanism changes.

This is a reland of https://crrev.com/c/887819.

BUG=797051
R=erikchen@chromium.org, justincohen@chromium.org

Change-Id: I6628170430265e54e6ed0d42509114825b85a6b8
Reviewed-on: https://chromium-review.googlesource.com/1030816Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Sergey Berezin <sergeyberezin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554882}
parent 3e568aae
......@@ -30,7 +30,7 @@ def _IsCorpMachine():
def main():
allow_corp = sys.argv[1] == 'mac' and _IsCorpMachine()
if os.environ.get('FORCE_MAC_TOOLCHAIN') or allow_corp:
if not mac_toolchain.PlatformMeetsHermeticXcodeRequirements(sys.argv[1]):
if not mac_toolchain.PlatformMeetsHermeticXcodeRequirements():
return "2"
return "1"
else:
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment