commit 9410b51037ab6b2497b03f3888a3e1defd9dcbeb
author ehmaldonado <ehmaldonado@webrtc.org> Thu Jan 19 19:57:56 2017
committer Commit bot <commit-bot@chromium.org> Thu Jan 19 19:57:56 2017
tree 3e396f5c668d1f77d00c00abf2001b8208ea5eab
parent d74886350e432547e7a70095170fe1a9a0dab0c8

GN: Add audio_conference_mixer_unittests to modules_unittests.

Was removed by accident in https://codereview.webrtc.org/2629923002/

BUG=webrtc:6954
R=kjellander@webrtc.org
NOTRY=True

Review-Url: https://codereview.webrtc.org/2641203002
Cr-Commit-Position: refs/heads/master@{#16170}

webrtc/modules/BUILD.gn

diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index 5accf3f..d87e7f9 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -260,6 +260,7 @@
     deps += [
       "../test:test_main",
       "audio_coding:audio_coding_unittests",
+      "audio_conference_mixer:audio_conference_mixer_unittests",
       "audio_device:audio_device_unittests",
       "audio_mixer:audio_mixer_unittests",
       "audio_processing:audio_processing_unittests",

webrtc/modules/audio_conference_mixer/BUILD.gn

diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/webrtc/modules/audio_conference_mixer/BUILD.gn
index 3c6f3d3..b4705d5 100644
--- a/webrtc/modules/audio_conference_mixer/BUILD.gn
+++ b/webrtc/modules/audio_conference_mixer/BUILD.gn
@@ -58,6 +58,12 @@
       "../../test:test_support",
       "//testing/gmock",
     ]
+    if (is_win) {
+      cflags = [
+        # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
+        "/wd4373",  # virtual function override.
+      ]
+    }
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]