Merge remote-tracking branch 'upstream/sdk-1.3.231' into main
Bug: 112606
Change-Id: Icbf28c5b65557e9087e32c85b2b5a4aa55ab484e
diff --git a/BUILD.gn b/BUILD.gn
index 29328d4..928fad6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -58,6 +58,7 @@
changes_file,
script,
template_file,
+ ".git/HEAD",
]
outputs = [ out_file ]
args = [
@@ -109,6 +110,8 @@
config("glslang_hlsl") {
defines = [ "ENABLE_HLSL=1" ]
+
+ cflags = [ "-Wno-conversion" ]
}
template("glslang_sources_common") {
@@ -260,6 +263,12 @@
"-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough",
"-Wno-inconsistent-missing-override",
+
+ # TODO(rosasco): Fuchsia-only flags
+ "-Wno-unused-variable",
+ "-Wno-unknown-warning-option",
+ "-Wno-extra-semi",
+
"-Wno-missing-field-initializers",
"-Wno-newline-eof",
"-Wno-sign-compare",
@@ -268,6 +277,7 @@
"-Wno-unused-variable",
]
}
+
if (is_win && !is_clang) {
cflags = [
"/wd4018", # signed/unsigned mismatch
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..166185a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+jjosh@google.com
+liyl@google.com
+cfontas@google.com
+
