Reland "mac: Switch to Xcode 16.0 16A242d with macOS SDK 15.0 24A336"
This is a reland offbc74102ad
(https://chromium-review.googlesource.com/c/5868532), which was reverted in1bf416f7dd
(https://chromium-review.googlesource.com/c/5867385) because it caused Mac ASan 64 Builder to fail its compile step in the generate_v8_context_snapshot step (https://crbug.com/367764848). This can reland atopdaa2e0a593
(https://chromium-review.googlesource.com/c/5873781), which should prevent generate_v8_context_snapshot from failing under Address Sanitizer. Original change's description: > mac: Switch to Xcode 16.0 16A242d with macOS SDK 15.0 24A336 > > FOR CHECKIN > FOR CHICKEN > PARA POLLO > POUR LE POULET > 🐣 > > Bug: 367439535 > Change-Id: I13c4849eddb458b76d973dcc059c7043b63b4245 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5868532 > Reviewed-by: Nico Weber <thakis@chromium.org> > Commit-Queue: Mark Mentovai <mark@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1356474} Bug: 367439535 Change-Id: I63b4a8072ba453291c22da5f6b37b16a6a4190c3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5873345 Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Auto-Submit: Mark Mentovai <mark@chromium.org> Cr-Commit-Position: refs/heads/main@{#1357347}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
74243bceb6
commit
a5fb630f30
build
@ -45,12 +45,12 @@ 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 = "14.0"
|
||||
mac_sdk_official_version = "15.0"
|
||||
|
||||
# The SDK build version used when making official builds. This is a single
|
||||
# exact version found at "System/Library/CoreServices/SystemVersion.plist"
|
||||
# inside the SDK.
|
||||
mac_sdk_official_build_version = "23A334"
|
||||
mac_sdk_official_build_version = "24A336"
|
||||
|
||||
# Production builds should use hermetic Xcode. If you want to do production
|
||||
# builds with system Xcode to test new SDKs, set this.
|
||||
|
@ -33,16 +33,14 @@ def LoadPList(path):
|
||||
return plistlib.load(f)
|
||||
|
||||
|
||||
# This contains binaries from Xcode 15.0 15A240d along with the macOS 14.0 SDK
|
||||
# (14.0 23A334). To build these packages, see comments in
|
||||
# build/xcode_binaries.yaml
|
||||
# This contains binaries from Xcode 16.0 16A242d along with the macOS 15.0 SDK
|
||||
# (24A336). To build these packages, see comments in build/xcode_binaries.yaml.
|
||||
# To update the version numbers, open Xcode's "About Xcode" for the first number
|
||||
# and run `xcrun --show-sdk-build-version` for the second.
|
||||
# To update the _TAG, use the output of the `cipd create` command mentioned in
|
||||
# xcode_binaries.yaml.
|
||||
# and run `xcrun --show-sdk-build-version` for the second. To update the _TAG,
|
||||
# use the output of the `cipd create` command mentioned in xcode_binaries.yaml.
|
||||
|
||||
MAC_BINARIES_LABEL = 'infra_internal/ios/xcode/xcode_binaries/mac-amd64'
|
||||
MAC_BINARIES_TAG = 'dC_BLs9U850OLk8m4V7yxysPhP-ixJ2b5c7hVm8B7tIC'
|
||||
MAC_BINARIES_TAG = 'Frm7sYyjocgTMac6vFlyzenLZUQVWNZ3J2XhsIeJB0YC'
|
||||
|
||||
# The toolchain will not be downloaded if the minimum OS version is not met. 19
|
||||
# is the major version number for macOS 10.15. Xcode 15.0 only runs on macOS
|
||||
|
@ -22,7 +22,7 @@ root: "xcode_binaries"
|
||||
data:
|
||||
- dir: Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
|
||||
- dir: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/share/bison
|
||||
- dir: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/metal/macos
|
||||
- dir: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/metal
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/air-lld
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/bison
|
||||
- file: Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/gm4
|
||||
|
Reference in New Issue
Block a user