Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1231)

Unified Diff: build/vs_toolchain.py

Issue 1587073006: New VS 2015 package and copy ucrtbased.dll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix line length Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/vs_toolchain.py
diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py
index ed0042b8786d3135becb310bc2478ef05c5078f7..a326f4b0cef7c2305a3811dc0eb2b16c5aea6c79 100755
--- a/build/vs_toolchain.py
+++ b/build/vs_toolchain.py
@@ -184,6 +184,9 @@ def _CopyRuntime(target_dir, source_dir, target_cpu, debug):
suffix = "d.dll" if debug else ".dll"
if GetVisualStudioVersion() == '2015':
_CopyRuntime2015(target_dir, source_dir, '%s140' + suffix)
+ if debug:
+ _CopyRuntimeImpl(os.path.join(target_dir, 'ucrtbased.dll'),
+ os.path.join(source_dir, 'ucrtbased.dll'))
else:
_CopyRuntime2013(target_dir, source_dir, 'msvc%s120' + suffix)
@@ -262,7 +265,8 @@ def _GetDesiredVsToolchainHashes():
"""Load a list of SHA1s corresponding to the toolchains that we want installed
to build with."""
if GetVisualStudioVersion() == '2015':
- return ['17c7ddb3595be5c6b9c98b6f930adad7e4456671'] # Update 1
+ # Update 1 with Debuggers, UCRT installers and ucrtbased.dll
+ return ['524956ec6e64e68fead3773e3ce318537657b404']
else:
# Default to VS2013.
return ['9ff97c632ae1fee0c98bcd53e71770eb3a0d8deb']
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698