commit 376eae0dfdec5d11d3da323319c395ef0cb23b46
author dan sinclair <dsinclair@chromium.org> Tue Feb 06 17:58:55 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 06 17:58:55 2024 +0000
tree e2bff461dd424c4e7fcfe3feb616a8237deb0e60
parent 4e1cbbcd77863c4f1c47a6b7312de3e901f3b438

Revert "Only build spvtools_* when dawn_enable_spirv_validation is true"

This reverts commit e2be33f0b421ba63985f5fc0ecf060614782993e.

Reason for revert: Seeing failures on the Dawn -> Chrome roll about spirv-tools build issues. Speculatively reverting this to see if it unblocks the roll.

https://ci.chromium.org/ui/p/chromium/builders/try/android_compile_dbg/1801462/overview


Original change's description:
> Only build spvtools_* when dawn_enable_spirv_validation is true
>
> Bug: dawn:286
> Change-Id: I90e641cf65cba1d480d09ad99f999c600348f887
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/172462
> Reviewed-by: Austin Eng <enga@chromium.org>
> Kokoro: Kokoro <noreply+kokoro@google.com>
> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
> Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: dawn:286
Change-Id: Ie488adfacb1550bf6ccb255b2857fca50c4b5f6f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/173700
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Kokoro: Austin Eng <enga@chromium.org>
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/dawn/native/BUILD.gn

diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index 6d93677..3b750b7 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -163,6 +163,11 @@
     "${dawn_root}/src/dawn/common",
     "${dawn_root}/src/tint/api",
     "${dawn_root}/src/tint/lang/wgsl/features",
+
+    # TODO(dawn:286): These should only be necessary if SPIR-V validation is
+    # enabled with dawn_enable_spirv_validation
+    "${dawn_spirv_tools_dir}:spvtools_opt",
+    "${dawn_spirv_tools_dir}:spvtools_val",
   ]
   defines = []
   libs = []
@@ -675,10 +680,6 @@
       "SpirvValidation.cpp",
       "SpirvValidation.h",
     ]
-    deps += [
-      "${dawn_spirv_tools_dir}:spvtools_opt",
-      "${dawn_spirv_tools_dir}:spvtools_val",
-    ]
   }
 
   if (dawn_enable_opengl) {