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

Unified Diff: build/win/copy_cdb_to_output.py

Issue 2106203002: Switch to VS 2015 Update 3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add the missing DLL so the tests work Created 4 years, 3 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 | « build/vs_toolchain.py ('k') | tools/perf/chrome_telemetry_build/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/win/copy_cdb_to_output.py
diff --git a/build/win/copy_cdb_to_output.py b/build/win/copy_cdb_to_output.py
index ea6ab3f4b304c1cf5fa0f28dfe6156362d5c038d..33bcac71f6909f4dff1e0adbdc1e0fddbac277e9 100755
--- a/build/win/copy_cdb_to_output.py
+++ b/build/win/copy_cdb_to_output.py
@@ -3,6 +3,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import glob
import hashlib
import os
import shutil
@@ -77,6 +78,7 @@ def _CopyCDBToOutput(output_dir, target_arch):
dst_winext_dir = os.path.join(output_dir, 'winext')
src_winxp_dir = os.path.join(src_dir, 'winxp')
dst_winxp_dir = os.path.join(output_dir, 'winxp')
+ src_crt_dir = os.path.join(win_sdk_dir, r'Redist\ucrt\DLLs', src_arch)
_ConditionalMkdir(dst_winext_dir)
_ConditionalMkdir(dst_winxp_dir)
# Note that the outputs from the "copy_cdb_to_output" target need to
@@ -89,6 +91,9 @@ def _CopyCDBToOutput(output_dir, target_arch):
_CopyImpl('uext.dll', dst_winext_dir, src_winext_dir)
_CopyImpl('exts.dll', dst_winxp_dir, src_winxp_dir)
_CopyImpl('ntsdexts.dll', dst_winxp_dir, src_winxp_dir)
+ for dll_path in glob.glob(os.path.join(src_crt_dir, 'api-ms-win-*.dll')):
+ _CopyImpl(os.path.split(dll_path)[1], output_dir, src_crt_dir)
+ _CopyImpl('ucrtbase.dll', output_dir, src_crt_dir)
return 0
« no previous file with comments | « build/vs_toolchain.py ('k') | tools/perf/chrome_telemetry_build/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698