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

Unified Diff: webrtc/test/test.gyp

Issue 2336123002: Revert of Moved webrtc/test/channel_transport/ into webrtc/voice_engine/test/ (Closed)
Patch Set: Created 4 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/test/channel_transport/udp_transport_unittest.cc ('k') | webrtc/voice_engine/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/test.gyp
diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index 86a32c31657e9f2ade3d7cfc35c26f4650317e73..7f64b77aca543328523f88f9daa23dcdf7e240d0 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -12,6 +12,55 @@
'../build/common.gypi',
],
'targets': [
+ {
+ 'target_name': 'channel_transport',
+ 'type': 'static_library',
+ 'dependencies': [
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(webrtc_root)/common.gyp:webrtc_common',
+ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+ ],
+ 'sources': [
+ 'channel_transport/channel_transport.cc',
+ 'channel_transport/channel_transport.h',
+ 'channel_transport/traffic_control_win.cc',
+ 'channel_transport/traffic_control_win.h',
+ 'channel_transport/udp_socket_manager_posix.cc',
+ 'channel_transport/udp_socket_manager_posix.h',
+ 'channel_transport/udp_socket_manager_wrapper.cc',
+ 'channel_transport/udp_socket_manager_wrapper.h',
+ 'channel_transport/udp_socket_posix.cc',
+ 'channel_transport/udp_socket_posix.h',
+ 'channel_transport/udp_socket_wrapper.cc',
+ 'channel_transport/udp_socket_wrapper.h',
+ 'channel_transport/udp_socket2_manager_win.cc',
+ 'channel_transport/udp_socket2_manager_win.h',
+ 'channel_transport/udp_socket2_win.cc',
+ 'channel_transport/udp_socket2_win.h',
+ 'channel_transport/udp_transport.h',
+ 'channel_transport/udp_transport_impl.cc',
+ 'channel_transport/udp_transport_impl.h',
+ ],
+ 'msvs_disabled_warnings': [
+ 4302, # cast truncation
+ ],
+ 'conditions': [
+ ['OS=="win" and clang==1', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [
+ # Disable warnings failing when compiling with Clang on Windows.
+ # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
+ '-Wno-parentheses-equality',
+ '-Wno-reorder',
+ '-Wno-tautological-constant-out-of-range-compare',
+ '-Wno-unused-private-field',
+ ],
+ },
+ },
+ }],
+ ], # conditions.
+ },
{
'target_name': 'video_test_common',
'type': 'static_library',
@@ -153,6 +202,7 @@
'target_name': 'test_support_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
+ 'channel_transport',
'test_common',
'test_support_main',
'<(webrtc_root)/modules/modules.gyp:video_capture',
@@ -164,6 +214,9 @@
'frame_generator_unittest.cc',
'rtp_file_reader_unittest.cc',
'rtp_file_writer_unittest.cc',
+ 'channel_transport/udp_transport_unittest.cc',
+ 'channel_transport/udp_socket_manager_unittest.cc',
+ 'channel_transport/udp_socket_wrapper_unittest.cc',
'testsupport/always_passing_unittest.cc',
'testsupport/unittest_utils.h',
'testsupport/fileutils_unittest.cc',
« no previous file with comments | « webrtc/test/channel_transport/udp_transport_unittest.cc ('k') | webrtc/voice_engine/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698