Revert "Reland "Reland "Bump Windows SDK to 10.0.19041.0"""

This reverts commit 3dc913b12b4853ef620495a74081dd15fca8dc5e.

Reason for revert: while the SDK is now being fetched, the step
Read SetEnv.platform.json is now failing.

https://logs.chromium.org/logs/crashpad/buildbucket/cr-buildbucket/8831436994854248129/+/u/read_SetEnv.x86.json/stdout

Original change's description:
> Reland "Reland "Bump Windows SDK to 10.0.19041.0""
>
> This is a reland of 44f566832da48b25c09ee83d4221a9c57f359a82
>
> The proper format for this sort of property is:
>
>     properties["$depot_tools/windows_sdk"] = {
>         "version": "uploaded:2021-04-28",
>     }
>
> rather than the nested version we had before.
>
> Original change's description:
> > Reland "Bump Windows SDK to 10.0.19041.0"
> >
> > This is a reland of 020da53ac84de675c8adae5b512f4257adc9dfe3
> >
> > Original change's description:
> > > Bump Windows SDK to 10.0.19041.0
> > >
> > > Change-Id: Id0c308a838a8b94ce7d24369ffd168a10730a30a
> > > Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3256822
> > > Reviewed-by: Mark Mentovai <mark@chromium.org>
> > > Commit-Queue: Mark Mentovai <mark@chromium.org>
> >
> > Change-Id: I9e8d14415c12c28b6a230b689d3b791a086d7a06
> > Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3260604
> > Commit-Queue: Alex Gough <ajgo@chromium.org>
> > Reviewed-by: Mark Mentovai <mark@chromium.org>
>
> Change-Id: Iafb40bd8799dbfea9308f19e3c6e7568bcba82df
> Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3260757
> Commit-Queue: Alex Gough <ajgo@chromium.org>
> Reviewed-by: Mark Mentovai <mark@chromium.org>

Change-Id: If7d29c2d95491eb7df23b21383deef7a85f9192f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3260758
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Alex Gough <ajgo@chromium.org>
This commit is contained in:
Alex Gough 2021-11-05 03:27:47 +00:00 committed by Crashpad LUCI CQ
parent 3dc913b12b
commit 5225da1232
3 changed files with 1 additions and 18 deletions

2
DEPS
View File

@ -106,7 +106,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chrome_internal/third_party/sdk/windows', 'package': 'chrome_internal/third_party/sdk/windows',
'version': 'uploaded:2021-04-28' 'version': 'uploaded:2018-06-13'
}, },
], ],
'condition': 'checkout_win and pull_win_toolchain', 'condition': 'checkout_win and pull_win_toolchain',

View File

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

View File

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