commit 231200f9483de38da96fb7bf16cab8e4f92d31f5
author Mirko Bonadei <mbonadei@webrtc.org> Mon May 14 11:58:05 2018
committer Mirko Bonadei <mbonadei@webrtc.org> Mon May 14 11:58:50 2018
tree ac7b3d6290a830962bc1428dfa4c07fe57508fef
parent 6e8a05d4d6909c684bcf05114ab6d27ffdf846fa

Revert "Consider winsdk_samples a system library."

This reverts commit 6e8a05d4d6909c684bcf05114ab6d27ffdf846fa.

Reason for revert: clang-cl doesn't have -isystem, but /imsvc does
what we need.

Change-Id: Ie6ce521effc67491586f2f16ea3e03a6c78b69c0
TBR=phoglund@webrtc.org
Reviewed-on: https://webrtc-review.googlesource.com/76520
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index fc73edb..291a208 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -10,13 +10,30 @@
   baseclasses_dir = "Samples/multimedia/directshow/baseclasses"
 
   config("winsdk_samples_config") {
+    include_dirs = [ baseclasses_dir ]
+  }
+
+  config("winsdk_samples_warnings_config") {
     if (is_win && is_clang) {
       cflags = [
-        "-isystem",
-        rebase_path(baseclasses_dir, root_build_dir)
+        # Disable warnings failing when compiling with Clang on Windows.
+        # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
+        "-Wno-comment",
+        "-Wno-delete-non-virtual-dtor",
+        "-Wno-ignored-attributes",
+        "-Wno-logical-op-parentheses",
+        "-Wno-non-pod-varargs",
+        "-Wno-microsoft-extra-qualification",
+        "-Wno-missing-braces",
+        "-Wno-overloaded-virtual",
+        "-Wno-parentheses",
+        "-Wno-reorder",
+        "-Wno-string-conversion",
+        "-Wno-tautological-constant-out-of-range-compare",
+        "-Wno-unknown-pragmas",
+        "-Wno-unused-private-field",
+        "-Wno-writable-strings",
       ]
-    } else {
-      include_dirs = [ baseclasses_dir ]
     }
   }
 
@@ -93,6 +110,7 @@
     ]
     configs += [
       "//build/config/compiler:no_chromium_code",
+      ":winsdk_samples_warnings_config",
     ]
   }
 }