From fb0db9a019c18ff3c7b016df9e33e304e5649522 Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Fri, 8 Nov 2019 19:23:29 +0000 Subject: [PATCH] Copy all UCRT files to cdb directory The Windows 10 19013 Preview SDK has an extra UCRT file in the debuggers directory and this file (api-ms-win-downlevel-kernel32-l2-1-0.dll) is needed when running cdb.exe on Windows 7. This change allows the copy_cdb_to_output action to run with 18632 and later SDKs. Once we require a later SDK we should add the new file to the list of outputs for this action but this will smooth the otherwise bumpy transition. Bug: 1021650 Change-Id: I2304aea73dfcd25258697c37d05b05dc6adff55e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904873 Reviewed-by: Thomas Anderson Commit-Queue: Bruce Dawson Cr-Original-Commit-Position: refs/heads/master@{#713912} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: ff51aa28b262422402784c62eb2787b03b012f36 --- win/copy_cdb_to_output.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/win/copy_cdb_to_output.py b/win/copy_cdb_to_output.py index 1f0f22a87..a0b99bb77 100755 --- a/win/copy_cdb_to_output.py +++ b/win/copy_cdb_to_output.py @@ -102,7 +102,13 @@ def _CopyCDBToOutput(output_dir, target_arch): _CopyImpl('exts.dll', dst_winxp_dir, src_winxp_dir) _CopyImpl('ntsdexts.dll', dst_winxp_dir, src_winxp_dir) if src_arch in ['x64', 'x86']: - _CopyImpl('api-ms-win-eventing-provider-l1-1-0.dll', output_dir, src_dir) + # Copy all UCRT files from the debuggers directory, for compatibility with + # the Windows 10 18362 SDK (one UCRT file) and later versions (two UCRT + # files). The new file is api-ms-win-downlevel-kernel32-l2-1-0.dll and + # should be added to the copy_cdb_to_output outputs when we require a newer + # SDK. + for file in glob.glob(os.path.join(src_dir, 'api-ms-win*.dll')): + _CopyImpl(os.path.split(file)[1], output_dir, src_dir) _CopyImpl('ucrtbase.dll', output_dir, src_crt_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)