Index: webrtc/voice_engine/BUILD.gn |
diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn |
index 8e7e29ae2f9869b7f3b9271776fe1a28e9f0ca2e..e773ebd0497a64d98a79f017accc5824c3970fd0 100644 |
--- a/webrtc/voice_engine/BUILD.gn |
+++ b/webrtc/voice_engine/BUILD.gn |
@@ -120,70 +120,8 @@ |
} |
if (rtc_include_tests) { |
- config("channel_transport_warnings_config") { |
- if (is_win) { |
- cflags = [ "/wd4302" ] # cast truncation |
- |
- if (is_clang) { |
- # GN orders flags on a target before flags from configs. The default |
- # config adds -Wall, and this flag have to be after -Wall -- so they need |
- # to come from a config and cannot be on the target directly. |
- cflags += [ |
- "-Wno-parentheses-equality", |
- "-Wno-reorder", |
- "-Wno-tautological-constant-out-of-range-compare", |
- |
- # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6268 |
- # for -Wno-thread-safety-analysis |
- "-Wno-thread-safety-analysis", |
- "-Wno-unused-private-field", |
- ] |
- } |
- } |
- } |
- |
- rtc_source_set("channel_transport") { |
- testonly = true |
- sources = [ |
- "test/channel_transport/channel_transport.cc", |
- "test/channel_transport/channel_transport.h", |
- "test/channel_transport/traffic_control_win.cc", |
- "test/channel_transport/traffic_control_win.h", |
- "test/channel_transport/udp_socket2_manager_win.cc", |
- "test/channel_transport/udp_socket2_manager_win.h", |
- "test/channel_transport/udp_socket2_win.cc", |
- "test/channel_transport/udp_socket2_win.h", |
- "test/channel_transport/udp_socket_manager_posix.cc", |
- "test/channel_transport/udp_socket_manager_posix.h", |
- "test/channel_transport/udp_socket_manager_wrapper.cc", |
- "test/channel_transport/udp_socket_manager_wrapper.h", |
- "test/channel_transport/udp_socket_posix.cc", |
- "test/channel_transport/udp_socket_posix.h", |
- "test/channel_transport/udp_socket_wrapper.cc", |
- "test/channel_transport/udp_socket_wrapper.h", |
- "test/channel_transport/udp_transport.h", |
- "test/channel_transport/udp_transport_impl.cc", |
- "test/channel_transport/udp_transport_impl.h", |
- ] |
- |
- configs += [ ":channel_transport_warnings_config" ] |
- |
- if (is_clang && !is_nacl) { |
- # Suppress warnings from the Chromium Clang plugin. |
- # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
- suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
- } |
- |
- deps = [ |
- "..:webrtc_common", |
- "../system_wrappers", |
- "//testing/gtest", |
- ] |
- } |
- |
rtc_test("voice_engine_unittests") { |
deps = [ |
- ":channel_transport", |
":voice_engine", |
"//testing/gmock", |
"//testing/gtest", |
@@ -207,9 +145,6 @@ |
sources = [ |
"channel_unittest.cc", |
"network_predictor_unittest.cc", |
- "test/channel_transport/udp_socket_manager_unittest.cc", |
- "test/channel_transport/udp_socket_wrapper_unittest.cc", |
- "test/channel_transport/udp_transport_unittest.cc", |
"transmit_mixer_unittest.cc", |
"utility_unittest.cc", |
"voe_audio_processing_unittest.cc", |
@@ -241,7 +176,6 @@ |
testonly = true |
deps = [ |
- ":channel_transport", |
":voice_engine", |
"//testing/gmock", |
"//testing/gtest", |
@@ -250,6 +184,7 @@ |
"//webrtc/modules/video_capture", |
"//webrtc/system_wrappers", |
"//webrtc/system_wrappers/:system_wrappers_default", |
+ "//webrtc/test/:channel_transport", |
"//webrtc/test/:test_common", |
"//webrtc/test/:test_support", |
] |