OLD | NEW |
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 config("audio_conference_mixer_config") { | 9 config("audio_conference_mixer_config") { |
10 visibility = [ ":*" ] # Only targets in this file can depend on this. | 10 visibility = [ ":*" ] # Only targets in this file can depend on this. |
(...skipping 27 matching lines...) Expand all Loading... |
38 | 38 |
39 if (is_clang) { | 39 if (is_clang) { |
40 # Suppress warnings from Chrome's Clang plugins. | 40 # Suppress warnings from Chrome's Clang plugins. |
41 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 41 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
42 configs -= [ "//build/config/clang:find_bad_constructs" ] | 42 configs -= [ "//build/config/clang:find_bad_constructs" ] |
43 } | 43 } |
44 } | 44 } |
45 | 45 |
46 source_set("audio_conference_mixer") { | 46 source_set("audio_conference_mixer") { |
47 sources = [ | 47 sources = [ |
48 "include/audio_mixer_defines.h", | 48 "audio_frame_manipulator.cc", |
49 "include/new_audio_conference_mixer.h", | 49 "audio_frame_manipulator.h", |
50 "source/new_audio_conference_mixer_impl.cc", | 50 "audio_mixer_defines.h", |
51 "source/new_audio_conference_mixer_impl.h", | 51 "new_audio_conference_mixer.h", |
| 52 "new_audio_conference_mixer_impl.cc", |
| 53 "new_audio_conference_mixer_impl.h", |
52 ] | 54 ] |
53 | 55 |
54 public = [ | 56 public = [ |
55 "include/audio_mixer_defines.h", | 57 "audio_mixer_defines.h", |
56 "include/new_audio_conference_mixer.h", | 58 "new_audio_conference_mixer.h", |
57 ] | 59 ] |
58 | 60 |
59 configs += [ "../..:common_config" ] | 61 configs += [ "../..:common_config" ] |
60 | 62 |
61 public_configs = [ | 63 public_configs = [ |
62 "../..:common_inherited_config", | 64 "../..:common_inherited_config", |
63 ":audio_conference_mixer_config", | 65 ":audio_conference_mixer_config", |
64 ] | 66 ] |
65 | 67 |
66 if (is_clang) { | 68 if (is_clang) { |
67 # Suppress warnings from Chrome's Clang plugins. | 69 # Suppress warnings from Chrome's Clang plugins. |
68 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 70 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
69 configs -= [ "//build/config/clang:find_bad_constructs" ] | 71 configs -= [ "//build/config/clang:find_bad_constructs" ] |
70 } | 72 } |
71 | 73 |
72 deps = [ | 74 deps = [ |
73 "../../base:rtc_base_approved", | 75 "../../base:rtc_base_approved", |
74 "../../modules/audio_processing", | 76 "../../modules/audio_processing", |
75 "../../modules/utility", | 77 "../../modules/utility", |
76 "../../system_wrappers", | 78 "../../system_wrappers", |
77 ] | 79 ] |
78 } | 80 } |
OLD | NEW |