Skip to content

Commit

Permalink
win: Switch to 10.0.14393.0 SDK
Browse files Browse the repository at this point in the history
The 10.0.14393.0 SDK was packaged at the same time as the 10.0.10586.0
SDK, during the switch to VS 2015 Update 3. The only reason the SDK
wasn't switched at the same time was to isolate the two changes from
each other, and there's no reason I am aware not to change the SDK now.

R=brucedawson@chromium.org
BUG=440500

Review-Url: https://codereview.chromium.org/2555393003
Cr-Commit-Position: refs/heads/master@{#437190}
  • Loading branch information
sgraham authored and Commit bot committed Dec 8, 2016
1 parent 66af5a9 commit b77dd49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/get_landmines.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def print_landmines():
print ('Improper dependency for create_nmf.py broke in r240802, '
'fixed in r240860.')
if (platform() == 'win' and gyp_msvs_version().startswith('2015')):
print 'Switch to VS2015 Update 3'
print 'Switch to VS2015 Update 3, 14393 SDK'
print 'Need to clobber everything due to an IDL change in r154579 (blink)'
print 'Need to clobber everything due to gen file moves in r175513 (Blink)'
if (platform() != 'ios'):
Expand Down
8 changes: 2 additions & 6 deletions build/vs_toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,8 @@ def _GetDesiredVsToolchainHashes():
"""Load a list of SHA1s corresponding to the toolchains that we want installed
to build with."""
if GetVisualStudioVersion() == '2015':
if bool(int(os.environ.get('DEPOT_TOOLS_WIN_SDK_PRERELEASE', '0'))):
# Update 3 final with patches with 10.0.14393 SDK.
return ['d3cb0e37bdd120ad0ac4650b674b09e81be45616']
else:
# Update 3 final with patches with 10.0.10586.0 SDK.
return ['d5dc33b15d1b2c086f2f6632e2fd15882f80dbd3']
# Update 3 final with patches with 10.0.14393.0 SDK.
return ['d3cb0e37bdd120ad0ac4650b674b09e81be45616']
else:
return ['03a4e939cd325d6bc5216af41b92d02dda1366a6']

Expand Down

0 comments on commit b77dd49

Please sign in to comment.