Commit 1923efac authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Revert "Reland "mac: roll to 10.15 SDK""

This reverts commit a3182e3f.

Reason for revert: crbug.com/1023913#c10, crbug.com/1046100

Original change's description:
> Reland "mac: roll to 10.15 SDK"
> 
> This is a reland of fd84ab8a
> 
> Original change's description:
> > mac: roll to 10.15 SDK
> >
> > This change rolls the hermetic Xcode to 11.2.1 aka 11B53, with the
> > 10.15 SDK.
> >
> > Bug: 1023913
> > Change-Id: I072a57b5f9c93bc08984b05d0de3ea62886a59dd
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1964531
> > Reviewed-by: Nico Weber <thakis@chromium.org>
> > Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
> > Cr-Original-Commit-Position: refs/heads/master@{#725141}
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993723
> > Cr-Commit-Position: refs/heads/master@{#730238}
> 
> Bug: 1023913
> Change-Id: Icb5ca715edd7972c8b3824aa58a8e2b8df25d15b
> Tbr: thakis@chromium.org
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2022257
> Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#735493}

TBR=ellyjones@chromium.org,thakis@chromium.org

Change-Id: I48247599e2c713951465dbb24c25efc822f0c433
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1023913
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024027Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735576}
parent b4cb14f3
...@@ -35,7 +35,7 @@ declare_args() { ...@@ -35,7 +35,7 @@ declare_args() {
# The SDK version used when making official builds. This is a single exact # The SDK version used when making official builds. This is a single exact
# version, not a minimum. If this version isn't available official builds # version, not a minimum. If this version isn't available official builds
# will fail. # will fail.
mac_sdk_official_version = "10.15" mac_sdk_official_version = "10.14"
} }
# Check that the version of macOS SDK used is the one requested when building # Check that the version of macOS SDK used is the one requested when building
......
...@@ -28,10 +28,10 @@ import subprocess ...@@ -28,10 +28,10 @@ import subprocess
import sys import sys
# This contains binaries from Xcode 11.2.1, along with the 10.15 SDKs (aka # This contains binaries from Xcode 10.12.1, along with the 10.14 SDKs. To build
# 11B53). To build this package, see comments in build/xcode_binaries.yaml # this package, see comments in build/xcode_binaries.yaml
MAC_BINARIES_LABEL = 'infra_internal/ios/xcode/xcode_binaries/mac-amd64' MAC_BINARIES_LABEL = 'infra_internal/ios/xcode/xcode_binaries/mac-amd64'
MAC_BINARIES_TAG = 'HHSqYjco5P_Q5g9gOWV6djGpZ9aqlV12N0hxKJv8U3gC' MAC_BINARIES_TAG = 'yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC'
# The toolchain will not be downloaded if the minimum OS version is not met. # The toolchain will not be downloaded if the minimum OS version is not met.
# 17 is the major version number for macOS 10.13. # 17 is the major version number for macOS 10.13.
......
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