GN: Fix windows clang errors. Attempt 2.

webrtc/base/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
@@ skipping 218 matching lines @@
         "task_queue_gcd.cc",
         "task_queue_posix.cc",
       ]
     }
     if (is_win) {
       sources += [ "task_queue_win.cc" ]
     }
   }
 }
 
+config("rtc_base_warnings_config") {
+  if (is_win && is_clang) {
+    cflags = [
+      # Disable warnings failing when compiling with Clang on Windows.
+      # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
+      "-Wno-sign-compare",
+      "-Wno-missing-braces",
+    ]
+  }
+}
+
 static_library("rtc_base") {
   cflags = []
   cflags_cc = []
   libs = []
   deps = [
     "..:webrtc_common",
   ]
   public_deps = [
     ":rtc_base_approved",
   ]
 
   configs += [
     "..:common_config",
     ":openssl_config",
     ":rtc_base_config",
   ]
 
   public_configs = [
     "..:common_inherited_config",
     ":openssl_config",
     ":rtc_base_config",
   ]
 
   all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
-
   defines = [ "LOGGING=1" ]
 
   sources = [
     "arraysize.h",
     "asyncfile.cc",
     "asyncfile.h",
     "asyncinvoker-inl.h",
     "asyncinvoker.cc",
     "asyncinvoker.h",
     "asyncpacketsocket.cc",
@@ skipping 124 matching lines @@
     "thread.cc",
     "thread.h",
     "timing.cc",
     "timing.h",
     "urlencode.cc",
     "urlencode.h",
     "worker.cc",
     "worker.h",
   ]
 
+  # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
+  # compiler settings.
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
+  if (!is_win) {
+    cflags += [ "-Wno-uninitialized" ]
+  }
+
   if (build_with_chromium) {
     if (is_win) {
       sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
     }
 
     include_dirs = [
       "../../webrtc_overrides",
       "../../boringssl/src/include",
     ]
 
     public_configs += [ ":rtc_base_chromium_config" ]
   } else {
+    configs += [ ":rtc_base_warnings_config" ]
     sources += [
       "bandwidthsmoother.cc",
       "bandwidthsmoother.h",
       "callback.h",
       "fileutils_mock.h",
       "httpserver.cc",
       "httpserver.h",
       "json.cc",
       "json.h",
       "logsinks.cc",
@@ skipping 71 matching lines @@
         "diskcache_win32.cc",
         "diskcache_win32.h",
         "win32regkey.cc",
         "win32regkey.h",
         "win32socketinit.cc",
         "win32socketinit.h",
         "win32socketserver.cc",
         "win32socketserver.h",
       ]
     }
-    if (is_win && is_clang) {
-      cflags += [
-        # Disable warnings failing when compiling with Clang on Windows.
-        # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
-        "-Wno-sign-compare",
-        "-Wno-missing-braces",
-      ]
-    }
 
     if (rtc_build_json) {
       deps += [ "//third_party/jsoncpp" ]
     } else {
       include_dirs = [ "$rtc_jsoncpp_root" ]
 
       # When defined changes the include path for json.h to where it is
       # expected to be when building json outside of the standalone build.
       defines += [ "WEBRTC_EXTERNAL_JSON" ]
     }
   }  # !build_with_chromium
 
-  # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
-  # compiler settings.
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-  if (!is_win) {
-    cflags += [ "-Wno-uninitialized" ]
-  }
-
   if (rtc_build_ssl) {
     deps += [ "//third_party/boringssl" ]
   } else {
     configs += [ ":external_ssl_library" ]
   }
 
   if (is_android) {
     sources += [
       "ifaddrs-android.cc",
       "ifaddrs-android.h",
@@ skipping 109 matching lines @@
       "linux.cc",
       "linux.h",
     ]
   }
 
   if (is_nacl) {
     deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
     defines += [ "timezone=_timezone" ]
     sources -= [ "ifaddrs_converter.cc" ]
   }
+  if (is_clang) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    configs -= [ "//build/config/clang:find_bad_constructs" ]
+  }
 }
 
 source_set("gtest_prod") {
   sources = [
     "gtest_prod_util.h",
   ]
 }
 
 if (rtc_include_tests) {
   config("rtc_base_tests_utils_exported_config") {
     defines = [ "GTEST_RELATIVE_PATH" ]
   }
 
+  config("rtc_base_tests_utils_warnings_config") {
+    if (is_win && is_clang) {
+      cflags = [
+        # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270
+        "-Wno-reorder",
+        "-Wno-sign-compare",
+      ]
+    }
+  }
+
   source_set("rtc_base_tests_utils") {
     testonly = true
     sources = [
       # Also use this as a convenient dumping ground for misc files that are
       # included by multiple targets below.
       "fakeclock.cc",
       "fakeclock.h",
       "fakenetwork.h",
       "fakesslidentity.h",
       "faketaskrunner.h",
       "gunit.h",
       "test/faketiming.h",
       "testbase64.h",
       "testechoserver.h",
       "testutils.h",
       "timedelta.h",
       "unittest_main.cc",
     ]
-    configs += [ "..:common_config" ]
+    configs += [
+      "..:common_config",
+      ":rtc_base_tests_utils_warnings_config",
+    ]
     public_configs = [
       "..:common_inherited_config",
       ":rtc_base_tests_utils_exported_config",
     ]
     deps = [
       ":rtc_base",
       "../test:field_trial",
       "../test:test_support",
     ]
     public_deps = [
       "//testing/gtest",
     ]
+
+    if (is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      configs -= [ "//build/config/clang:find_bad_constructs" ]
+    }
   }
 }
 
 if (is_android) {
   android_library("base_java") {
     java_files = [
       "java/src/org/webrtc/Logging.java",
       "java/src/org/webrtc/Size.java",
       "java/src/org/webrtc/ThreadUtils.java",
     ]
 
     deps = [
       "//base:base_java",
     ]
   }
 }