| 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 import("../build/webrtc.gni") | 9 import("../build/webrtc.gni") | 
| 10 import("//testing/test.gni") |  | 
| 11 | 10 | 
| 12 source_set("voice_engine") { | 11 rtc_source_set("voice_engine") { | 
| 13   sources = [ | 12   sources = [ | 
| 14     "channel.cc", | 13     "channel.cc", | 
| 15     "channel.h", | 14     "channel.h", | 
| 16     "channel_manager.cc", | 15     "channel_manager.cc", | 
| 17     "channel_manager.h", | 16     "channel_manager.h", | 
| 18     "channel_proxy.cc", | 17     "channel_proxy.cc", | 
| 19     "channel_proxy.h", | 18     "channel_proxy.h", | 
| 20     "include/voe_audio_processing.h", | 19     "include/voe_audio_processing.h", | 
| 21     "include/voe_base.h", | 20     "include/voe_base.h", | 
| 22     "include/voe_codec.h", | 21     "include/voe_codec.h", | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 78       "/wd4373",  # Virtual function override. | 77       "/wd4373",  # Virtual function override. | 
| 79     ] | 78     ] | 
| 80   } | 79   } | 
| 81 | 80 | 
| 82   configs += [ "..:common_config" ] | 81   configs += [ "..:common_config" ] | 
| 83   public_configs = [ "..:common_inherited_config" ] | 82   public_configs = [ "..:common_inherited_config" ] | 
| 84 | 83 | 
| 85   if (is_clang) { | 84   if (is_clang) { | 
| 86     # Suppress warnings from Chrome's Clang plugins. | 85     # Suppress warnings from Chrome's Clang plugins. | 
| 87     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 86     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 88     configs -= [ "//build/config/clang:find_bad_constructs" ] | 87     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 89   } | 88   } | 
| 90 | 89 | 
| 91   deps = [ | 90   deps = [ | 
| 92     ":level_indicator", | 91     ":level_indicator", | 
| 93     "..:rtc_event_log", | 92     "..:rtc_event_log", | 
| 94     "..:webrtc_common", | 93     "..:webrtc_common", | 
| 95     "../api:call_api", | 94     "../api:call_api", | 
| 96     "../base:rtc_base_approved", | 95     "../base:rtc_base_approved", | 
| 97     "../common_audio", | 96     "../common_audio", | 
| 98     "../modules/audio_coding", | 97     "../modules/audio_coding", | 
| 99     "../modules/audio_conference_mixer", | 98     "../modules/audio_conference_mixer", | 
| 100     "../modules/audio_device", | 99     "../modules/audio_device", | 
| 101     "../modules/audio_processing", | 100     "../modules/audio_processing", | 
| 102     "../modules/bitrate_controller", | 101     "../modules/bitrate_controller", | 
| 103     "../modules/media_file", | 102     "../modules/media_file", | 
| 104     "../modules/pacing", | 103     "../modules/pacing", | 
| 105     "../modules/rtp_rtcp", | 104     "../modules/rtp_rtcp", | 
| 106     "../modules/utility", | 105     "../modules/utility", | 
| 107     "../system_wrappers", | 106     "../system_wrappers", | 
| 108   ] | 107   ] | 
| 109 } | 108 } | 
| 110 | 109 | 
| 111 source_set("level_indicator") { | 110 rtc_source_set("level_indicator") { | 
| 112   sources = [ | 111   sources = [ | 
| 113     "level_indicator.cc", | 112     "level_indicator.cc", | 
| 114     "level_indicator.h", | 113     "level_indicator.h", | 
| 115   ] | 114   ] | 
| 116 | 115 | 
| 117   configs += [ "..:common_config" ] | 116   configs += [ "..:common_config" ] | 
| 118   public_configs = [ "..:common_inherited_config" ] | 117   public_configs = [ "..:common_inherited_config" ] | 
| 119 | 118 | 
| 120   deps = [ | 119   deps = [ | 
| 121     "..:webrtc_common", | 120     "..:webrtc_common", | 
| 122     "../base:rtc_base_approved", | 121     "../base:rtc_base_approved", | 
| 123     "../common_audio", | 122     "../common_audio", | 
| 124   ] | 123   ] | 
| 125 } | 124 } | 
| 126 | 125 | 
| 127 if (rtc_include_tests) { | 126 if (rtc_include_tests) { | 
| 128   test("voice_engine_unittests") { | 127   rtc_test("voice_engine_unittests") { | 
| 129     deps = [ | 128     deps = [ | 
| 130       ":voice_engine", | 129       ":voice_engine", | 
| 131       "//testing/gmock", | 130       "//testing/gmock", | 
| 132       "//testing/gtest", | 131       "//testing/gtest", | 
| 133       "//webrtc/common_audio", | 132       "//webrtc/common_audio", | 
| 134       "//webrtc/modules/audio_coding", | 133       "//webrtc/modules/audio_coding", | 
| 135       "//webrtc/modules/audio_conference_mixer", | 134       "//webrtc/modules/audio_conference_mixer", | 
| 136       "//webrtc/modules/audio_device", | 135       "//webrtc/modules/audio_device", | 
| 137       "//webrtc/modules/audio_processing", | 136       "//webrtc/modules/audio_processing", | 
| 138       "//webrtc/modules/media_file", | 137       "//webrtc/modules/media_file", | 
| (...skipping 26 matching lines...) Expand all  Loading... | 
| 165 | 164 | 
| 166       cflags = [ | 165       cflags = [ | 
| 167         # TODO(kjellander): Bug 261: fix this warning. | 166         # TODO(kjellander): Bug 261: fix this warning. | 
| 168         "/wd4373",  # Virtual function override. | 167         "/wd4373",  # Virtual function override. | 
| 169       ] | 168       ] | 
| 170     } | 169     } | 
| 171 | 170 | 
| 172     if (is_clang) { | 171     if (is_clang) { | 
| 173       # Suppress warnings from Chrome's Clang plugins. | 172       # Suppress warnings from Chrome's Clang plugins. | 
| 174       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 173       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 175       configs -= [ "//build/config/clang:find_bad_constructs" ] | 174       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 176     } | 175     } | 
| 177   } | 176   } | 
| 178 | 177 | 
| 179   if (!is_ios) { | 178   if (!is_ios) { | 
| 180     executable("voe_auto_test") { | 179     rtc_executable("voe_auto_test") { | 
| 181       testonly = true | 180       testonly = true | 
| 182 | 181 | 
| 183       deps = [ | 182       deps = [ | 
| 184         ":voice_engine", | 183         ":voice_engine", | 
| 185         "//build/config/sanitizers:deps", | 184         "//build/config/sanitizers:deps", | 
| 186         "//testing/gmock", | 185         "//testing/gmock", | 
| 187         "//testing/gtest", | 186         "//testing/gtest", | 
| 188         "//third_party/gflags", | 187         "//third_party/gflags", | 
| 189         "//webrtc/:rtc_event_log", | 188         "//webrtc/:rtc_event_log", | 
| 190         "//webrtc/modules/video_capture", | 189         "//webrtc/modules/video_capture", | 
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 259         cflags = [ | 258         cflags = [ | 
| 260           "/wd4267",  # size_t to int truncation. | 259           "/wd4267",  # size_t to int truncation. | 
| 261           "/wd4373",  # Virtual function override. | 260           "/wd4373",  # Virtual function override. | 
| 262                       # TODO(kjellander): Bug 261: fix this warning. | 261                       # TODO(kjellander): Bug 261: fix this warning. | 
| 263         ] | 262         ] | 
| 264       } | 263       } | 
| 265 | 264 | 
| 266       if (is_clang) { | 265       if (is_clang) { | 
| 267         # Suppress warnings from Chrome's Clang plugins. | 266         # Suppress warnings from Chrome's Clang plugins. | 
| 268         # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 267         # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 269         configs -= [ "//build/config/clang:find_bad_constructs" ] | 268         suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 270       } | 269       } | 
| 271     } | 270     } | 
| 272   } | 271   } | 
| 273 } | 272 } | 
| OLD | NEW | 
|---|