Re-re-reland "mac: roll to 10.15 SDK"
This is a reland of fd84ab8a64f7c9b05631084c524b95201f5ed50f. This change: 1) Includes a new cipd package version that contains the 'size-classic' binary from the 10.15 SDK, missing in the original package 2) Can be coordinated with a re-land of the internal CL (https://chrome-internal-review.googlesource.com/c/chrome/src-internal/+/2404878) to keep the perf builders happy - they are stuck on the 10.14 SDK for reasons currently obscure. 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: I62d9e82673b2d3f4993fbd08654fed85c2319cfb Tbr: thakis@chromium.org Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2022257 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024490 Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#735944} Cr-Original-Original-Commit-Position: refs/heads/master@{#735493} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 5fed7d85f8db76e4068cd3762b9fa2cce7a44e05
This commit is contained in:
Родитель
65838f61ea
Коммит
9f84364df2
|
@ -35,7 +35,7 @@ declare_args() {
|
|||
# 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
|
||||
# will fail.
|
||||
mac_sdk_official_version = "10.14"
|
||||
mac_sdk_official_version = "10.15"
|
||||
}
|
||||
|
||||
# Check that the version of macOS SDK used is the one requested when building
|
||||
|
|
|
@ -28,10 +28,10 @@ import subprocess
|
|||
import sys
|
||||
|
||||
|
||||
# This contains binaries from Xcode 10.12.1, along with the 10.14 SDKs. To build
|
||||
# this package, see comments in build/xcode_binaries.yaml
|
||||
# This contains binaries from Xcode 11.2.1, along with the 10.15 SDKs (aka
|
||||
# 11B53). To build this package, see comments in build/xcode_binaries.yaml
|
||||
MAC_BINARIES_LABEL = 'infra_internal/ios/xcode/xcode_binaries/mac-amd64'
|
||||
MAC_BINARIES_TAG = 'yjQtk3auAegQO4t18uBtBlKbj76xBjVtLE-3UM2faRUC'
|
||||
MAC_BINARIES_TAG = 'X5ZbqG_UKa-N64_XSBkAwShWPtzskeXhQRfpzc_1KUYC'
|
||||
|
||||
# The toolchain will not be downloaded if the minimum OS version is not met.
|
||||
# 17 is the major version number for macOS 10.13.
|
||||
|
|
|
@ -27,6 +27,7 @@ data:
|
|||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/otool
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/size
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/size-classic
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/libtapi.dylib
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/libLTO.dylib
|
||||
|
|
Загрузка…
Ссылка в новой задаче