| 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 | 10 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 if (is_win) { | 70 if (is_win) { |
| 71 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] | 71 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] |
| 72 | 72 |
| 73 cflags = [ | 73 cflags = [ |
| 74 # TODO(kjellander): Bug 261: fix this warning. | 74 # TODO(kjellander): Bug 261: fix this warning. |
| 75 "/wd4373", # Virtual function override. | 75 "/wd4373", # Virtual function override. |
| 76 ] | 76 ] |
| 77 } | 77 } |
| 78 | 78 |
| 79 if (is_clang) { | 79 if (!build_with_chromium && is_clang) { |
| 80 # Suppress warnings from Chrome's Clang plugins. | 80 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 81 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 82 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 81 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 83 } | 82 } |
| 84 | 83 |
| 85 public_deps = [ | 84 public_deps = [ |
| 86 "../modules/audio_coding", | 85 "../modules/audio_coding", |
| 87 ] | 86 ] |
| 88 deps = [ | 87 deps = [ |
| 89 ":level_indicator", | 88 ":level_indicator", |
| 90 "..:webrtc_common", | 89 "..:webrtc_common", |
| 91 "../api:call_api", | 90 "../api:call_api", |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 "test/channel_transport/udp_socket_posix.h", | 158 "test/channel_transport/udp_socket_posix.h", |
| 160 "test/channel_transport/udp_socket_wrapper.cc", | 159 "test/channel_transport/udp_socket_wrapper.cc", |
| 161 "test/channel_transport/udp_socket_wrapper.h", | 160 "test/channel_transport/udp_socket_wrapper.h", |
| 162 "test/channel_transport/udp_transport.h", | 161 "test/channel_transport/udp_transport.h", |
| 163 "test/channel_transport/udp_transport_impl.cc", | 162 "test/channel_transport/udp_transport_impl.cc", |
| 164 "test/channel_transport/udp_transport_impl.h", | 163 "test/channel_transport/udp_transport_impl.h", |
| 165 ] | 164 ] |
| 166 | 165 |
| 167 configs += [ ":channel_transport_warnings_config" ] | 166 configs += [ ":channel_transport_warnings_config" ] |
| 168 | 167 |
| 169 if (is_clang && !is_nacl) { | 168 if (!build_with_chromium && is_clang) { |
| 170 # Suppress warnings from the Chromium Clang plugin. | 169 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 171 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 172 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 170 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 173 } | 171 } |
| 174 | 172 |
| 175 deps = [ | 173 deps = [ |
| 176 "..:webrtc_common", | 174 "..:webrtc_common", |
| 177 "../system_wrappers", | 175 "../system_wrappers", |
| 178 "//testing/gtest", | 176 "//testing/gtest", |
| 179 ] | 177 ] |
| 180 } | 178 } |
| 181 | 179 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 | 217 |
| 220 if (is_win) { | 218 if (is_win) { |
| 221 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] | 219 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] |
| 222 | 220 |
| 223 cflags = [ | 221 cflags = [ |
| 224 # TODO(kjellander): Bug 261: fix this warning. | 222 # TODO(kjellander): Bug 261: fix this warning. |
| 225 "/wd4373", # Virtual function override. | 223 "/wd4373", # Virtual function override. |
| 226 ] | 224 ] |
| 227 } | 225 } |
| 228 | 226 |
| 229 if (is_clang) { | 227 if (!build_with_chromium && is_clang) { |
| 230 # Suppress warnings from Chrome's Clang plugins. | 228 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 231 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 232 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 229 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 233 } | 230 } |
| 234 } | 231 } |
| 235 | 232 |
| 236 rtc_executable("voe_cmd_test") { | 233 rtc_executable("voe_cmd_test") { |
| 237 testonly = true | 234 testonly = true |
| 238 | 235 |
| 239 deps = [ | 236 deps = [ |
| 240 ":channel_transport", | 237 ":channel_transport", |
| 241 ":voice_engine", | 238 ":voice_engine", |
| 242 "//testing/gtest", | 239 "//testing/gtest", |
| 243 "//third_party/gflags", | 240 "//third_party/gflags", |
| 244 "//webrtc/logging:rtc_event_log_api", | 241 "//webrtc/logging:rtc_event_log_api", |
| 245 "//webrtc/system_wrappers", | 242 "//webrtc/system_wrappers", |
| 246 "//webrtc/system_wrappers:system_wrappers_default", | 243 "//webrtc/system_wrappers:system_wrappers_default", |
| 247 "//webrtc/test:test_support", | 244 "//webrtc/test:test_support", |
| 248 ] | 245 ] |
| 249 | 246 |
| 250 sources = [ | 247 sources = [ |
| 251 "test/cmd_test/voe_cmd_test.cc", | 248 "test/cmd_test/voe_cmd_test.cc", |
| 252 ] | 249 ] |
| 253 | 250 |
| 254 if (is_clang) { | 251 if (!build_with_chromium && is_clang) { |
| 255 # Suppress warnings from Chrome's Clang plugins. | 252 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 256 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 257 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 253 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 258 } | 254 } |
| 259 } | 255 } |
| 260 | 256 |
| 261 if (!is_ios) { | 257 if (!is_ios) { |
| 262 rtc_executable("voe_auto_test") { | 258 rtc_executable("voe_auto_test") { |
| 263 testonly = true | 259 testonly = true |
| 264 | 260 |
| 265 deps = [ | 261 deps = [ |
| 266 ":channel_transport", | 262 ":channel_transport", |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 if (is_win) { | 333 if (is_win) { |
| 338 defines += [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] | 334 defines += [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] |
| 339 | 335 |
| 340 cflags = [ | 336 cflags = [ |
| 341 "/wd4267", # size_t to int truncation. | 337 "/wd4267", # size_t to int truncation. |
| 342 "/wd4373", # Virtual function override. | 338 "/wd4373", # Virtual function override. |
| 343 # TODO(kjellander): Bug 261: fix this warning. | 339 # TODO(kjellander): Bug 261: fix this warning. |
| 344 ] | 340 ] |
| 345 } | 341 } |
| 346 | 342 |
| 347 if (is_clang) { | 343 if (!build_with_chromium && is_clang) { |
| 348 # Suppress warnings from Chrome's Clang plugins. | 344 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
. |
| 349 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 350 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 345 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 351 } | 346 } |
| 352 } | 347 } |
| 353 } | 348 } |
| 354 } | 349 } |
| OLD | NEW |