Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit b15365d

Browse files
randomasciiMrunal Kapade
authored and
Mrunal Kapade
committed
[Backport] Change default Win10 SDK from 10240 to 10586
This is required for Visual Studio 2013 builds to work; version 10240 of the Win10 SDK are no longer distributed by Microsoft, 10586 is. Original commit message: ------------------------ When Chromium switched to the Windows 10 SDK it specified the 10240 version but this is missing IVirtualDesktopManager and other types. This doesn't affect VS 2015 builds because the package the 10586 SDK, but it does affect builds where DEPOT_TOOLS_WIN_TOOLCHAIN=0 is set. This change updates the local-toolchain builds to require the 10586 SDK. Developers are responsible for installing it. BUG=491424,516306 Review URL: https://codereview.chromium.org/1608013002
1 parent cb62553 commit b15365d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build/common.gypi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3327,17 +3327,17 @@
33273327
'MinimumRequiredVersion': '5.02', # Server 2003.
33283328
'TargetMachine': '17', # x86 - 64
33293329
'AdditionalLibraryDirectories!':
3330-
['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'],
3330+
['<(windows_sdk_path)/Lib/10.0.10586.0/um/x86'],
33313331
'AdditionalLibraryDirectories':
3332-
['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'],
3332+
['<(windows_sdk_path)/Lib/10.0.10586.0/um/x64'],
33333333
# Doesn't exist x64 SDK. Should use oleaut32 in any case.
33343334
'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
33353335
},
33363336
'VCLibrarianTool': {
33373337
'AdditionalLibraryDirectories!':
3338-
['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'],
3338+
['<(windows_sdk_path)/Lib/10.0.10586.0/um/x86'],
33393339
'AdditionalLibraryDirectories':
3340-
['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'],
3340+
['<(windows_sdk_path)/Lib/10.0.10586.0/um/x64'],
33413341
'TargetMachine': '17', # x64
33423342
},
33433343
},
@@ -5674,9 +5674,9 @@
56745674
}],
56755675
],
56765676
'msvs_system_include_dirs': [
5677-
'<(windows_sdk_path)/Include/10.0.10240.0/shared',
5678-
'<(windows_sdk_path)/Include/10.0.10240.0/um',
5679-
'<(windows_sdk_path)/Include/10.0.10240.0/winrt',
5677+
'<(windows_sdk_path)/Include/10.0.10586.0/shared',
5678+
'<(windows_sdk_path)/Include/10.0.10586.0/um',
5679+
'<(windows_sdk_path)/Include/10.0.10586.0/winrt',
56805680
'$(VSInstallDir)/VC/atlmfc/include',
56815681
],
56825682
'msvs_cygwin_shell': 0,

0 commit comments

Comments
 (0)