| Index: webrtc/voice_engine/voice_engine.gyp
|
| diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp
|
| index 76061dd1687888608da8ae14d51cb7519475ad4a..61dd2c038c266ecacd84c0838cf6bab237c4c29b 100644
|
| --- a/webrtc/voice_engine/voice_engine.gyp
|
| +++ b/webrtc/voice_engine/voice_engine.gyp
|
| @@ -109,80 +109,4 @@
|
| ]
|
| },
|
| ],
|
| - 'conditions': [
|
| - ['OS=="win"', {
|
| - 'defines': ['WEBRTC_DRIFT_COMPENSATION_SUPPORTED',],
|
| - }],
|
| - ['include_tests==1', {
|
| - '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': [
|
| - '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_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_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_transport.h',
|
| - 'test/channel_transport/udp_transport_impl.cc',
|
| - 'test/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.
|
| - },
|
| - {
|
| - # command line test that should work on linux/mac/win
|
| - 'target_name': 'voe_cmd_test',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - 'channel_transport',
|
| - 'voice_engine',
|
| - '<(DEPTH)/testing/gtest.gyp:gtest',
|
| - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
|
| - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
|
| - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
|
| - '<(webrtc_root)/test/test.gyp:test_support',
|
| - '<(webrtc_root)/webrtc.gyp:rtc_event_log',
|
| - ],
|
| - 'sources': [
|
| - 'test/cmd_test/voe_cmd_test.cc',
|
| - ],
|
| - },
|
| - ], # targets
|
| - }], # include_tests==1
|
| - ], # conditions
|
| }
|
|
|