GN: Fix windows clang errors. Attempt 2.

webrtc/modules/audio_device/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/webrtc.gni")
 
 config("audio_device_config") {
   include_dirs = [
     "../include",
     "include",
     "dummy",  # Contains dummy audio device implementations.
   ]
   if (is_ios) {
     # GN orders flags on a target before flags from configs. In order to be able
     # suppress the -Wthread-safety-analysis warning, it has come from a config
     # and can't be on the target directly.
     # TODO(tkchin): Remove after fixing
     # https://bugs.chromium.org/p/webrtc/issues/detail?id=5748
     cflags = [ "-Wno-thread-safety-analysis" ]
   }
 }
 
+config("audio_device_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-bool-conversion",
+      "-Wno-delete-non-virtual-dtor",
+      "-Wno-logical-op-parentheses",
+      "-Wno-microsoft-extra-qualification",
+      "-Wno-microsoft-goto",
+      "-Wno-missing-braces",
+      "-Wno-parentheses-equality",
+      "-Wno-reorder",
+      "-Wno-shift-overflow",
+      "-Wno-tautological-compare",
+
+      # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6265
+      # for -Wno-thread-safety-analysis
+      "-Wno-thread-safety-analysis",
+      "-Wno-unused-private-field",
+    ]
+  }
+}
+
 source_set("audio_device") {
+  configs += [ "../..:common_config" ]
+  public_configs = [
+    "../..:common_inherited_config",
+    ":audio_device_config",
+  ]
+
   deps = [
     "../..:webrtc_common",
     "../../base:rtc_base",
     "../../base:rtc_base_approved",
     "../../base:rtc_task_queue",
     "../../common_audio",
     "../../system_wrappers",
     "../utility",
   ]
 
@@ skipping 148 matching lines @@
           "win/audio_mixer_manager_win.h",
         ]
         libs = [
           # Required for the built-in WASAPI AEC.
           "dmoguids.lib",
           "wmcodecdspuuid.lib",
           "amstrmid.lib",
           "msdmo.lib",
         ]
       }
-      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-bool-conversion",
-          "-Wno-delete-non-virtual-dtor",
-          "-Wno-logical-op-parentheses",
-          "-Wno-microsoft-extra-qualification",
-          "-Wno-microsoft-goto",
-          "-Wno-missing-braces",
-          "-Wno-parentheses-equality",
-          "-Wno-reorder",
-          "-Wno-shift-overflow",
-          "-Wno-tautological-compare",
-          "-Wno-unused-private-field",
-        ]
-      }
+      configs += [ ":audio_device_warnings_config" ]
     }
   } else {
     defines = [ "WEBRTC_DUMMY_AUDIO_BUILD" ]
   }
 
   if (!build_with_chromium) {
     sources += [
       # Do not link these into Chrome since they contain static data.
       "dummy/file_audio_device_factory.cc",
       "dummy/file_audio_device_factory.h",
     ]
   }
 
-  configs += [ "../..:common_config" ]
-  public_configs = [
-    "../..:common_inherited_config",
-    ":audio_device_config",
-  ]
-
   if (is_clang) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 }
 
 # These tests do not work on ios, see
 # https://bugs.chromium.org/p/webrtc/issues/detail?id=4755
 if (rtc_include_tests && !is_ios) {
@@ skipping 14 matching lines @@
       "//build/config/sanitizers:deps",
       "//testing/gtest",
     ]
     configs += [ "../..:common_config" ]
     public_configs = [
       "../..:common_inherited_config",
       ":audio_device_config",
     ]
   }
 }