Commit 563f3875 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

mac: introduce separate official SDK version

Historically official builds were always done exactly at mac_sdk_min,
to protect against official bots having new SDKs deployed on them before
the SDK roll was ready. However, this forces any upgrade of the official
bots to also change mac_sdk_min, which affects all other builds.

This change adds a separate mac_sdk_official_version gn variable, which
is the exact SDK version to use in official builds. This will allow us to
roll the SDK without forcing downstream users to upgrade to the 10.15 SDK
immediately.

Bug: 1023913
Change-Id: I7a9f3069456edabf51db1b0f91bf85b8a0907410
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992195Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729828}
parent ad65e1a0
...@@ -31,6 +31,11 @@ declare_args() { ...@@ -31,6 +31,11 @@ declare_args() {
# The SDK name as accepted by xcodebuild. # The SDK name as accepted by xcodebuild.
mac_sdk_name = "macosx" mac_sdk_name = "macosx"
# 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"
} }
# 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
...@@ -67,7 +72,7 @@ if (!use_system_xcode) { ...@@ -67,7 +72,7 @@ if (!use_system_xcode) {
if (_verify_sdk) { if (_verify_sdk) {
find_sdk_args += [ find_sdk_args += [
"--verify", "--verify",
mac_sdk_min, mac_sdk_official_version,
"--sdk_path=" + mac_sdk_path, "--sdk_path=" + mac_sdk_path,
] ]
} else { } else {
......
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