Skip to content

A
angle
Commit 5c317537 by Tom Tan Committed by Commit Bot
Options

Don't copy d3dcompiler_47.dll when build target is Windows ARM64

Windows ARM64 was first released at 10.0.16299 which contains d3dcompiler_47.dll under %systemroot%\system32, so no need to copy it from Windows SDK. For the same reason, it is also not included as part of redistribute package for Windows ARM64. Bug: chromium:893460 Change-Id: I175ce831d800ec1f19c767fc172219f6b693fec3 Reviewed-on: https://chromium-review.googlesource.com/c/1357155 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 35cd7332
Showing with 6 additions and 2 deletions
BUILD.gn
...@@ -124,7 +124,9 @@ config("build_id_config") { ...@@ -124,7 +124,9 @@ config("build_id_config") {
ldflags = [ "-Wl,--build-id" ] ldflags = [ "-Wl,--build-id" ]
} }
if (is_win) { # Windows ARM64 is available since 10.0.16299 so no need to copy
# d3dcompiler_47.dll because this file is available as inbox.
if (is_win && target_cpu != "arm64") {
copy("copy_compiler_dll") { copy("copy_compiler_dll") {
sources = [ sources = [
"$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll", "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll",
...@@ -608,7 +610,9 @@ static_library("libANGLE") { ...@@ -608,7 +610,9 @@ static_library("libANGLE") {
public_configs = [ ":libANGLE_config" ] public_configs = [ ":libANGLE_config" ]
if (is_win) { # Windows ARM64 is available since 10.0.16299 so no need to copy
# d3dcompiler_47.dll because this file is available as inbox.
if (is_win && target_cpu != "arm64") {
data_deps = [ data_deps = [
":copy_compiler_dll", ":copy_compiler_dll",
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment