Merge commit 'caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31' into HEAD
This merges the Vulkan 1.4.304.1 SDK known-good version of shaderc
specified in https://github.com/google/shaderc/commit/3f164a03cd21f7d59be753a07c7626cffc74512d
Bug: 379153784
Change-Id: I5fa19896890e02a4a0e883f977cafcce076e130d
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/shaderc/+/1205827
Reviewed-by: Craig Stout <cstout@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index 9fb5fb7..02eaa32 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -22,6 +22,13 @@
include_dirs = [ "libshaderc_util/include" ]
}
+config("suppress_warnings") {
+ cflags = [
+ "-Wno-deprecated-copy",
+ "-Wno-extra-semi",
+ ]
+}
+
source_set("shaderc_util_sources") {
sources = [
"libshaderc_util/include/libshaderc_util/counting_includer.h",
@@ -56,6 +63,8 @@
"${spirv_tools_dir}:spvtools",
]
+ configs += [ ":suppress_warnings" ]
+
if (build_with_chromium) {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -89,9 +98,9 @@
deps = [
":shaderc_util_sources",
+ "${glslang_dir}:glslang_sources",
"${spirv_tools_dir}:spvtools",
"${spirv_tools_dir}:spvtools_val",
- "${glslang_dir}:glslang_sources",
]
if (build_with_chromium) {
