Fix copy_cdb outputs for ARM64 Win32 builds
On ARM64 Win32 builds the UCRT is not a redistributable and therefore
must be omitted from the list of outputs. Otherwise the
copy_cdb_to_output will never be clean.
This was tested before and after with this pair of commands:
ninja.exe -C out\arm64 copy_cdb_to_output
ninja.exe -d explain -C out\arm64 copy_cdb_to_output
Before the build step was always dirty. After it is always clean.
Bug: 937083
Change-Id: Ica53b1b172441925dcbb27f6033774d49b1df9af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1497491
Auto-Submit: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#637404}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: dd3e44cc62a0cb83a470f71749ac0f05f3c24838
This commit is contained in:
Bruce Dawson
Commit Bot
Родитель
dc0a196b7d
Коммит
818b3b4bd5
89
win/BUILD.gn
89
win/BUILD.gn
|
|
@ -32,49 +32,54 @@ if (is_win) {
|
||||||
"$root_out_dir/cdb/winext/uext.dll",
|
"$root_out_dir/cdb/winext/uext.dll",
|
||||||
"$root_out_dir/cdb/winxp/exts.dll",
|
"$root_out_dir/cdb/winxp/exts.dll",
|
||||||
"$root_out_dir/cdb/winxp/ntsdexts.dll",
|
"$root_out_dir/cdb/winxp/ntsdexts.dll",
|
||||||
"$root_out_dir/cdb/api-ms-win-core-console-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-datetime-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-debug-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-errorhandling-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-file-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-file-l1-2-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-file-l2-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-handle-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-heap-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-interlocked-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-libraryloader-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-localization-l1-2-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-memory-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-namedpipe-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-processenvironment-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-processthreads-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-processthreads-l1-1-1.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-profile-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-rtlsupport-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-string-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-synch-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-synch-l1-2-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-sysinfo-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-timezone-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-core-util-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-conio-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-convert-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-environment-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-filesystem-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-heap-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-locale-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-math-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-multibyte-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-private-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-process-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-runtime-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-stdio-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-string-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-time-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-crt-utility-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/api-ms-win-eventing-provider-l1-1-0.dll",
|
|
||||||
"$root_out_dir/cdb/ucrtbase.dll",
|
|
||||||
]
|
]
|
||||||
|
if (current_cpu != "arm64") {
|
||||||
|
# The UCRT files are not redistributable for ARM64 Win32.
|
||||||
|
outputs += [
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-console-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-datetime-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-debug-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-errorhandling-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-file-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-file-l1-2-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-file-l2-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-handle-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-heap-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-interlocked-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-libraryloader-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-localization-l1-2-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-memory-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-namedpipe-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-processenvironment-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-processthreads-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-processthreads-l1-1-1.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-profile-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-rtlsupport-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-string-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-synch-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-synch-l1-2-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-sysinfo-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-timezone-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-core-util-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-conio-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-convert-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-environment-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-filesystem-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-heap-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-locale-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-math-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-multibyte-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-private-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-process-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-runtime-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-stdio-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-string-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-time-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-crt-utility-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/api-ms-win-eventing-provider-l1-1-0.dll",
|
||||||
|
"$root_out_dir/cdb/ucrtbase.dll",
|
||||||
|
]
|
||||||
|
}
|
||||||
args = [
|
args = [
|
||||||
rebase_path("$root_out_dir/cdb", root_out_dir),
|
rebase_path("$root_out_dir/cdb", root_out_dir),
|
||||||
current_cpu,
|
current_cpu,
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче