Cherry pick PR #3183: Remove some temporarily disabled compiler warni…

…ngs for clang. (#3262) Refer to the original PR: #3183 Clean up the disabled compiler warnings. Only add `-Wno-psabi` for old compilers when compiling skia. b/330363799 --------- Co-authored-by: aee <[email protected]>
youtube · May 21, 2024 · d3b5d42 · d3b5d42
1 parent 3a523bb
commit d3b5d42
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 34 deletions.
diff --git a/cobalt/renderer/rasterizer/skia/skia/BUILD.gn b/cobalt/renderer/rasterizer/skia/skia/BUILD.gn
@@ -43,7 +43,10 @@ skia_common("skia_library_no_asan") {
   sources = skia_effects_imagefilter_sources_no_asan
   if (is_clang) {
     if (using_old_compiler) {
-      cflags_cc = [ "-Wno-c++1z-extensions" ]
+      cflags_cc = [
+        "-Wno-psabi",
+        "-Wno-c++1z-extensions",
+      ]
     } else {
       cflags_cc = [
         "-Wno-c++17-extensions",
@@ -88,7 +91,10 @@ config("skia_library_config_public") {
 
   if (is_clang) {
     if (using_old_compiler) {
-      cflags_cc = [ "-Wno-c++1z-extensions" ]
+      cflags_cc = [
+        "-Wno-psabi",
+        "-Wno-c++1z-extensions",
+      ]
     } else {
       cflags_cc = [
         "-Wno-c++17-extensions",

diff --git a/starboard/build/config/BUILD.gn b/starboard/build/config/BUILD.gn
@@ -34,49 +34,32 @@ if (cobalt_pending_clean_up) {
     if (is_clang) {
       cflags = [
         "-Wno-c99-designator",
-        "-Wno-psabi",
-        "-Wno-shorten-64-to-32",
-        "-Wno-unknown-warning-option",
-        "-Wno-array-parameter",
-        "-Wno-unknown-attributes",
-        "-Wno-bitwise-instead-of-logical",
-        "-Wno-c++20-extensions",
-        "-Wno-c++98-compat-extra-semi",
-        "-Wno-delete-non-abstract-non-virtual-dtor",
-        "-Wno-deprecated-copy",
-        "-Wno-extra-semi",
+        "-Wno-deprecated-declarations",
         "-Wno-ignored-qualifiers",
         "-Wno-implicit-fallthrough",
+        "-Wno-inconsistent-missing-override",
         "-Wno-invalid-noreturn",
         "-Wno-macro-redefined",
-        "-Wno-mismatched-tags",
-        "-Wno-missing-braces",
-        "-Wno-null-pointer-subtraction",
         "-Wno-pessimizing-move",
         "-Wno-reorder-ctor",
-        "-Wno-self-assign-overloaded",
-        "-Wno-self-assign",
-        "-Wno-shadow",
         "-Wno-sign-compare",
-        "-Wno-sometimes-uninitialized",
-        "-Wno-tautological-unsigned-zero-compare",
-        "-Wno-unreachable-code-break",
-        "-Wno-unreachable-code-loop-increment",
-        "-Wno-unreachable-code-return",
-        "-Wno-unreachable-code",
-        "-Wno-unused-but-set-parameter",
         "-Wno-unused-but-set-variable",
-        "-Wno-unused-function",
-        "-Wno-unused-label",
-        "-Wno-unused-local-typedef",
-        "-Wno-unused-private-field",
-        "-Wno-unused-variable",
-        "-Wno-unused-command-line-argument",
         "-Wno-unused-private-field",
-        "-Wno-deprecated-declarations",
-        "-Wno-inconsistent-missing-override",
+
+        # Needed for Evergreen, Android, and Stub.
         "-Wno-return-type",
+        "-Wno-shorten-64-to-32",
+        "-Wno-unknown-attributes",
+        "-Wno-unused-command-line-argument",
+        "-Wno-unused-function",
       ]
+
+      if (!using_old_compiler) {
+        cflags += [
+          "-Wno-shadow",
+          "-Wno-unreachable-code-break",
+        ]
+      }
     }
   }
 }