commit aa5a447569a7ed4dd24abc368d8b6726c77f9f3f
author John Bauman <jbauman@google.com> Thu Sep 17 19:41:00 2020 +0000
committer John Bauman <jbauman@google.com> Thu Sep 17 19:56:34 2020 +0000
tree 0dc9dd7f151f9e459f1b2157fce70796b62c9152
parent 5e67885750f931bd019c7e14e5748f28d568b482
parent 657fb934c870fbaa874804212b2fff1ea1684a1f

Merge commit '657fb934c870fbaa874804212b2fff1ea1684a1f'

Bug: 60158
Change-Id: Ibd18adf0ee32e7aa3a42aeedaa741217fe5e938a

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 49b4b0a..80e977c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -182,6 +182,8 @@
       "-Wno-inconsistent-missing-override",
       "-Wno-sign-compare",
       "-Wno-unused-variable",
+      "-Wno-unknown-warning-option",
+      "-Wno-conversion",
       "-Wno-missing-field-initializers",
       "-Wno-newline-eof",
     ]

glslang/CMakeLists.txt

diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index a0259a3..b77dee7 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(WIN32)
     add_subdirectory(OSDependent/Windows)
-elseif(UNIX)
+elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
     add_subdirectory(OSDependent/Unix)
 else(WIN32)
     message("unknown platform")