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

This reverts commit e5e47bc277532ae109a444cbb3646977c93fc077.

Reason for revert: depot_tools winapi recipe needs another minor change.

https://logs.chromium.org/logs/crashpad/buildbucket/cr-buildbucket/8830288168302335601/+/u/read_SetEnv_json/stdout?format=raw

https://logs.chromium.org/logs/crashpad/buildbucket/cr-buildbucket/8830288168302335601/+/u/read_SetEnv_json/stdout?format=raw

Original change's description:
> Reland "Reland "Reland "Bump Windows SDK to 10.0.19041.0"""
>
> This is a reland of 3dc913b12b4853ef620495a74081dd15fca8dc5e
>
> Previous attempt failed as the recipe helper in depot tools did not
> understand the new cipd win sdk layout and failed at the
> 'SetEnv.target.json' step.
> https://logs.chromium.org/logs/crashpad/buildbucket/cr-buildbucket/8831436994854248129/+/u/read_SetEnv.x86.json/stdout
>
> This should be addressed once
> https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3283800
> is rolled into the bot infrastructure.
>
> > 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>
> > Bug: crashpad:
>
> Bug: 1250098
> Change-Id: Ia3fa460e7054c85456bca37478b03c60906b36a9
> Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3286783
> Reviewed-by: Mark Mentovai <mark@chromium.org>
> Commit-Queue: Alex Gough <ajgo@chromium.org>

Bug: 1250098
Change-Id: If183131c20b15ec87a956fccee2dcbcf0c551091
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3290110
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Alex Gough <ajgo@chromium.org>
This commit is contained in:
Alex Gough 2021-11-17 20:22:43 +00:00 committed by Crashpad LUCI CQ
parent e5e47bc277
commit 801e7e7021
3 changed files with 1 additions and 18 deletions

2
DEPS
View File

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

View File

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

View File

@ -183,11 +183,6 @@ 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",