Vulkan: Avoid linking to SPIR-V validation if possible

src/libANGLE/renderer/glslang_wrapper_utils.cpp

@@ -902,6 +902,7 @@ constexpr gl::ShaderMap<EShLanguage> kShLanguageMap = {
     {gl::ShaderType::Compute, EShLangCompute},
 };
 
+#if defined(ANGLE_ENABLE_ASSERTS)
 void ValidateSpirvMessage(spv_message_level_t level,
                           const char *source,
                           const spv_position_t &position,
@@ -926,6 +927,14 @@ bool ValidateSpirv(const std::vector<uint32_t> &spirvBlob)
 
     return result;
 }
+#else   // ANGLE_ENABLE_ASSERTS
+bool ValidateSpirv(const std::vector<uint32_t> &spirvBlob)
+{
+    // Placeholder implementation since this is only used inside an ASSERT().
+    // Return false to indicate an error in case this is ever accidentally used somewhere else.
+    return false;
+}
+#endif  // ANGLE_ENABLE_ASSERTS
 
 // A SPIR-V transformer.  It walks the instructions and modifies them as necessary, for example to
 // assign bindings or locations.

src/libANGLE/renderer/vulkan/BUILD.gn

@@ -4,6 +4,7 @@
 #
 # This file houses the build configuration for the ANGLE Vulkan back-end.
 
+import("//build/config/dcheck_always_on.gni")
 import("//build_overrides/swiftshader.gni")
 import("../../../../gni/angle.gni")
 
@@ -198,8 +199,12 @@ angle_source_set("angle_vulkan_backend") {
     "$angle_root:angle_compression",
     "$angle_root:angle_gpu_info_util",
     "$angle_root:angle_image_util",
-    "$angle_spirv_tools_dir:spvtools_val",
   ]
+
+  if (dcheck_always_on || is_debug) {
+    deps += [ "$angle_spirv_tools_dir:spvtools_val" ]
+  }
+
   public_deps = [
     "$angle_root:angle_glslang_wrapper",
     "$angle_root:libANGLE_headers",