commit fbcfeebbc22aeeddfac60079fb0671ab7164ac50
author Primiano Tucci <primiano@google.com> Tue Jan 28 00:46:43 2020 +0000
committer Primiano Tucci <primiano@google.com> Tue Jan 28 00:46:43 2020 +0000
tree 0f353b3abed0e83f42a469a99561ed63ad4480e0
parent b1cec09a87d5fe59b8a86272039e557a36cd2f00

Fix standalone build after clang rolls

aosp/1217306 rolled clang but forgot to update the SHA1.
             this caused a bunch of new failures for new
             checkouts.
aosp/1218900 fixed the SHA1 but didn't solve the build errors,
             just made them consistent.
This CL fixes the build errors.

Bug: aosp/1218900
Change-Id: Ifb177fdc726dbe53eac29001a07bcff23bf1b7ee

gn/standalone/BUILD.gn

diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn
index ceb928f..387e258 100644
--- a/gn/standalone/BUILD.gn
+++ b/gn/standalone/BUILD.gn
@@ -16,6 +16,15 @@
 import("//gn/standalone/sanitizers/sanitizers.gni")
 import("//gn/standalone/wasm.gni")
 
+# These warnings have been introduced with the newest version of clang (only in
+# the hermetic build) and are enabled just with -Werror.
+# TODO(primiano): we should look into Wimplicit-int-float-conversion. Seems
+# failing mostly in tests though.
+hermetic_clang_suppressions = [
+  "-Wno-c99-designator",
+  "-Wno-implicit-int-float-conversion",
+]
+
 config("extra_warnings") {
   cflags = [
     "-Wall",
@@ -96,6 +105,12 @@
     ]
   }
 
+  if (is_hermetic_clang && is_linux && !is_wasm) {
+    cflags += hermetic_clang_suppressions
+  } else {
+    not_needed([ "hermetic_clang_suppressions" ])
+  }
+
   if (is_lto) {
     cflags += [ "-flto=full" ]
     ldflags += [ "-flto=full" ]