Disable pointer conversion warning in XNVCtrl

This warning happens on some older versions of the X headers, such as those present on the current Chromium linux_chromium_chromeos_rel_ng bots. The default warnings in the GN build are slightly more strict than in GYP which is why we need to add some isolated warning disables. BUG=432959 Change-Id: Id6218780195c59f160adae789305638d3463be9a Reviewed-on: https://chromium-review.googlesource.com/338424Reviewed-by: Corentin Wallez <cwallez@chromium.org>

Disable pointer conversion warning in XNVCtrl
81efa8ec · Brett Wilson · 71fb2100 · 81efa8ec
Commit 81efa8ec authored Apr 12, 2016 by Brett Wilson
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 7 deletions

BUILD.gn src/third_party/libXNVCtrl/BUILD.gn +23 -7

No files found.
--- a/src/third_party/libXNVCtrl/BUILD.gn
+++ b/src/third_party/libXNVCtrl/BUILD.gn
@@ -2,11 +2,27 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

-static_library("libXNVCtrl") {
-    sources = [
-        "NVCtrl.c",
-        "NVCtrl.h",
-        "NVCtrlLib.h",
-        "nv_control.h",
-    ]
+# This warning disable must be appended to the command line after the general
+# warnings setup, so must be in a config.
+config("libXNVCtrl_config") {
+  # This will build under most configurations with this warning enabled, but
+  # some older system headers are missing a "const" on the third parameter of
+  # XextAddDisplay which will cause a failure.
+  cflags = [
+    "-Wno-incompatible-pointer-types-discards-qualifiers",
+  ]
+}
+
+source_set("libXNVCtrl") {
+  sources = [
+    "NVCtrl.c",
+    "NVCtrl.h",
+    "NVCtrlLib.h",
+    "nv_control.h",
+  ]
+
+  configs += [
+    ":libXNVCtrl_config",
+    "//build/config/linux:x11",
+  ]
 }