From 9410b51037ab6b2497b03f3888a3e1defd9dcbeb Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Thu, 19 Jan 2017 11:57:56 -0800 Subject: [PATCH] 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 | 1 + webrtc/modules/audio_conference_mixer/BUILD.gn | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index 5accf3f3a0..d87e7f9612 100644 --- a/webrtc/modules/BUILD.gn +++ b/webrtc/modules/BUILD.gn @@ -260,6 +260,7 @@ if (rtc_include_tests) { 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", diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/webrtc/modules/audio_conference_mixer/BUILD.gn index 3c6f3d34d7..b4705d5329 100644 --- a/webrtc/modules/audio_conference_mixer/BUILD.gn +++ b/webrtc/modules/audio_conference_mixer/BUILD.gn @@ -58,6 +58,12 @@ if (rtc_include_tests) { "../../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" ]