Reland x7 "Bump Windows SDK to 10.0.19041.0"

This is a reland of a8683138db568ad89052587d081d280682439bc4

x86 env var VSINSTALLDIR=path\.\ was interpolated into a gn
vars file with a trailing slash. mini_chromium has been updated
to account for this[0].

[0] https://chromium-review.googlesource.com/c/chromium/mini_chromium/+/3338622

Original change's description:
> Reland x6 "Bump Windows SDK to 10.0.19041.0"
>
> Reland of cfb5c846745a3f3f28c63a1d74345fc965d2bac9.
>
> CL configures crashpad builders to use cipd packaged Windows SDK
> version 10.0.19041 and updates mini_chromium to account for new
> SDK layout[0].
>
> [0] https://chromium-review.googlesource.com/c/chromium/mini_chromium/+/3328284
>
> Bug: 1250098
> Change-Id: Ie8ea11497e31d51478041829c872b47f5c982ab8
> Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3334271
> Reviewed-by: Mark Mentovai <mark@chromium.org>
> Commit-Queue: Alex Gough <ajgo@chromium.org>

Bug: 1250098
Change-Id: Ie8145d498f4f3f10fd6195d8e0ad5a82bf25933b
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3339382
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Alex Gough <ajgo@chromium.org>
This commit is contained in:
Alex Gough 2021-12-14 09:22:22 -08:00 committed by Crashpad LUCI CQ
parent 3e234dfe96
commit ff50a9e8c4
3 changed files with 19 additions and 2 deletions

4
DEPS
View File

@ -39,7 +39,7 @@ deps = {
'7bde79cc274d06451bf65ae82c012a5d3e476b5a',
'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' +
'0e22eed71eec97dacbe80822a14c5cd0b580d793',
'502930381b23c5fa3911c8b82ec3e4ba6ceb3658',
'crashpad/third_party/libfuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
'fda403cf93ecb8792cb1d061564d89a6553ca020',
@ -106,7 +106,7 @@ deps = {
'packages': [
{
'package': 'chrome_internal/third_party/sdk/windows',
'version': 'uploaded:2018-06-13'
'version': 'uploaded:2021-04-28'
},
],
'condition': 'checkout_win and pull_win_toolchain',

View File

@ -450,6 +450,9 @@ buckets {
}
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' },'
' "$gatekeeper": {'
' "group": "client.crashpad"'
' },'
@ -483,6 +486,9 @@ buckets {
}
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' },'
' "$gatekeeper": {'
' "group": "client.crashpad"'
' },'
@ -922,6 +928,9 @@ buckets {
}
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' },'
' "$kitchen": {'
' "devshell": true,'
' "git_auth": true'
@ -952,6 +961,9 @@ buckets {
}
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' },'
' "$kitchen": {'
' "devshell": true,'
' "git_auth": true'

View File

@ -183,6 +183,11 @@ def crashpad_properties(platform, cpu, config, bucket):
if cpu != "x64":
properties["target_cpu"] = cpu
if platform == "win":
properties["$depot_tools/windows_sdk"] = {
"version": "uploaded:2021-04-28",
}
if bucket == "ci":
properties["$gatekeeper"] = {
"group": "client.crashpad",