diff options
| author | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2019-06-26 10:55:08 +0200 |
|---|---|---|
| committer | Tamas Zakor <ztamas@inf.u-szeged.hu> | 2019-06-26 13:52:06 +0000 |
| commit | 8782b5bd8924e499b454e558cf3ceefbe51b8ae5 (patch) | |
| tree | 5374716e7248a246deec1982cca35f78289abaf4 | |
| parent | 2d74719816cd64e9a5153a761ea742a53bcbe7d8 (diff) | |
[Backport] Update Chromium Windows SDK requirement to October 2018
Chromium requires the October 2018 Windows SDK. This change documents
and enforces that.
The previous enforcement code was buggy - a previous change updated
the message without updating the check. That's why the version number
skips ahead three instead of just two.
crrev.com/c/1546204 is the first change that requires this SDK.
Change-Id: Iaa1ee2152a07704fa1c7fcb601e2aa1eab92f264
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654094}
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/base/win/windows_version.cc | 6 | ||||
| -rw-r--r-- | chromium/docs/windows_build_instructions.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chromium/base/win/windows_version.cc b/chromium/base/win/windows_version.cc index 68410599d41..d5f64fff63b 100644 --- a/chromium/base/win/windows_version.cc +++ b/chromium/base/win/windows_version.cc @@ -23,9 +23,9 @@ #error VS 2017 Update 3.2 or higher is required #endif -#if !defined(NTDDI_WIN10_RS2) -// Windows 10 April 2018 SDK is required to build Chrome. -#error April 2018 SDK (10.0.17134.0) or higher required. +#if !defined(NTDDI_WIN10_RS5) +// Windows 10 October 2018 SDK is required to build Chrome. +#error October 2018 SDK (10.0.17763.0) or higher required. #endif namespace { diff --git a/chromium/docs/windows_build_instructions.md b/chromium/docs/windows_build_instructions.md index 5fc56ef0512..28c94080bf2 100644 --- a/chromium/docs/windows_build_instructions.md +++ b/chromium/docs/windows_build_instructions.md @@ -48,7 +48,7 @@ $ PATH_TO_INSTALLER.EXE ^ --includeRecommended ``` -You must have the version 10.0.17134 or higher Windows 10 SDK installed. This +You must have the version 10.0.17763 or higher Windows 10 SDK installed. This can be installed separately or by checking the appropriate box in the Visual Studio Installer. |