Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2271)

Side by Side Diff: webrtc/audio/BUILD.gn

Issue 2436033002: Replace AudioConferenceMixer with AudioMixer. (Closed)
Patch Set: Added mock mixer, merged audio state tests. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/audio/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("../build/webrtc.gni") 9 import("../build/webrtc.gni")
10 10
(...skipping 14 matching lines...) Expand all
25 if (!build_with_chromium && is_clang) { 25 if (!build_with_chromium && is_clang) {
26 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 26 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
27 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 27 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
28 } 28 }
29 29
30 deps = [ 30 deps = [
31 "..:webrtc_common", 31 "..:webrtc_common",
32 "../api:audio_mixer_api", 32 "../api:audio_mixer_api",
33 "../api:call_api", 33 "../api:call_api",
34 "../base:rtc_base_approved", 34 "../base:rtc_base_approved",
35 "../common_audio",
35 "../modules/audio_device", 36 "../modules/audio_device",
36 "../modules/audio_processing", 37 "../modules/audio_processing",
37 "../system_wrappers", 38 "../system_wrappers",
38 "../voice_engine", 39 "../voice_engine",
39 ] 40 ]
40 } 41 }
41 if (rtc_include_tests) { 42 if (rtc_include_tests) {
42 rtc_source_set("audio_tests") { 43 rtc_source_set("audio_tests") {
43 testonly = true 44 testonly = true
44 sources = [ 45 sources = [
45 "audio_receive_stream_unittest.cc", 46 "audio_receive_stream_unittest.cc",
46 "audio_send_stream_unittest.cc", 47 "audio_send_stream_unittest.cc",
47 "audio_state_unittest.cc", 48 "audio_state_unittest.cc",
48 ] 49 ]
49 deps = [ 50 deps = [
50 ":audio", 51 ":audio",
52 "../api:mock_audio_mixer",
51 "../base:rtc_base_approved", 53 "../base:rtc_base_approved",
52 "../modules/audio_device:mock_audio_device", 54 "../modules/audio_device:mock_audio_device",
55 "../modules/audio_mixer:audio_mixer_impl",
53 "../test:test_common", 56 "../test:test_common",
54 "//testing/gmock", 57 "//testing/gmock",
55 "//testing/gtest", 58 "//testing/gtest",
56 ] 59 ]
57 if (!build_with_chromium && is_clang) { 60 if (!build_with_chromium && is_clang) {
58 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 61 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
59 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 62 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
60 } 63 }
61 } 64 }
62 } 65 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698