From b15365d1d214d75f0ad43371531a24893966dcb1 Mon Sep 17 00:00:00 2001 From: brucedawson Date: Tue, 19 Jan 2016 17:11:48 -0800 Subject: [PATCH] [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 --- build/common.gypi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/common.gypi b/build/common.gypi index 09920609fd0da..149ee139f9241 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3327,17 +3327,17 @@ 'MinimumRequiredVersion': '5.02', # Server 2003. 'TargetMachine': '17', # x86 - 64 'AdditionalLibraryDirectories!': - ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'], + ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x86'], 'AdditionalLibraryDirectories': - ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'], + ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x64'], # Doesn't exist x64 SDK. Should use oleaut32 in any case. 'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ], }, 'VCLibrarianTool': { 'AdditionalLibraryDirectories!': - ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'], + ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x86'], 'AdditionalLibraryDirectories': - ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'], + ['<(windows_sdk_path)/Lib/10.0.10586.0/um/x64'], 'TargetMachine': '17', # x64 }, }, @@ -5674,9 +5674,9 @@ }], ], 'msvs_system_include_dirs': [ - '<(windows_sdk_path)/Include/10.0.10240.0/shared', - '<(windows_sdk_path)/Include/10.0.10240.0/um', - '<(windows_sdk_path)/Include/10.0.10240.0/winrt', + '<(windows_sdk_path)/Include/10.0.10586.0/shared', + '<(windows_sdk_path)/Include/10.0.10586.0/um', + '<(windows_sdk_path)/Include/10.0.10586.0/winrt', '$(VSInstallDir)/VC/atlmfc/include', ], 'msvs_cygwin_shell': 0,