From 0755fdbc8f092375d8d96f3a865e3249af9fe48e Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Thu, 9 Feb 2023 22:44:31 +0000 Subject: [PATCH] Use $windows_sdk_version instead of constant Dawn was using a hard-coded constant for the Windows SDK version number but that makes upgrading the Windows SDK to build Chromium impossible. This change uses the newly created $windows_sdk_version to solve this problem. This new variable was added in crrev.com/c/4234366 Bug: tint:1719 Change-Id: I6a9f74f542d3517c046d74178a41e1e4d5887e7f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/119340 Kokoro: Kokoro Commit-Queue: Kai Ninomiya Reviewed-by: Austin Eng --- src/dawn/tests/BUILD.gn | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/dawn/tests/BUILD.gn b/src/dawn/tests/BUILD.gn index 7614367462..ce5144c904 100644 --- a/src/dawn/tests/BUILD.gn +++ b/src/dawn/tests/BUILD.gn @@ -127,18 +127,19 @@ if (build_with_chromium && is_win && # The windows_sdk_path is acquired in visual_studio_version.gni. import("//build/config/win/visual_studio_version.gni") - # Windows 10 SDK version 10.0.20348.0 is required for building Chromium, and - # it provided DXC compiler and validator both of v1.6. + # Windows 10 SDK version 10.0.20348.0 provides DXC compiler and validator both + # of v1.6 and Chromium builds require this SDK version or higher. assert(defined(windows_sdk_path)) + assert(defined(windows_sdk_version)) assert(windows_sdk_path != "") # Declare a copy target to copy DXC binary from Windows SDK for running Dawn # end-to-end test in Chromium. copy("copy_dxc_binary") { sources = [ - "$windows_sdk_path/bin/10.0.20348.0/$target_cpu/dxc.exe", - "$windows_sdk_path/bin/10.0.20348.0/$target_cpu/dxcompiler.dll", - "$windows_sdk_path/bin/10.0.20348.0/$target_cpu/dxil.dll", + "$windows_sdk_path/bin/$windows_sdk_version/$target_cpu/dxc.exe", + "$windows_sdk_path/bin/$windows_sdk_version/$target_cpu/dxcompiler.dll", + "$windows_sdk_path/bin/$windows_sdk_version/$target_cpu/dxil.dll", ] outputs = [ "$root_out_dir/{{source_file_part}}" ]