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/+/1992195 Reviewed-by: Robert Sesek <rsesek@chromium.org> Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#729828} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 563f3875dbf14a39243e03b6bdb322d45738d89c
This commit is contained in:
Родитель
f8e9e47cbc
Коммит
17def5aa7a
|
@ -31,6 +31,11 @@ declare_args() {
|
|||
|
||||
# The SDK name as accepted by xcodebuild.
|
||||
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
|
||||
|
@ -67,7 +72,7 @@ if (!use_system_xcode) {
|
|||
if (_verify_sdk) {
|
||||
find_sdk_args += [
|
||||
"--verify",
|
||||
mac_sdk_min,
|
||||
mac_sdk_official_version,
|
||||
"--sdk_path=" + mac_sdk_path,
|
||||
]
|
||||
} else {
|
||||
|
|
Загрузка…
Ссылка в новой задаче