diff options
Diffstat (limited to 'webrtc/test/webrtc_test_common.gyp')
| -rw-r--r-- | webrtc/test/webrtc_test_common.gyp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp index d075cb470b..07ea2c9b74 100644 --- a/webrtc/test/webrtc_test_common.gyp +++ b/webrtc/test/webrtc_test_common.gyp @@ -32,17 +32,15 @@ 'fake_encoder.h', 'fake_network_pipe.cc', 'fake_network_pipe.h', - 'fake_voice_engine.cc', - 'fake_voice_engine.h', 'frame_generator_capturer.cc', 'frame_generator_capturer.h', 'layer_filtering_transport.cc', 'layer_filtering_transport.h', 'mock_transport.h', + 'mock_voe_channel_proxy.h', + 'mock_voice_engine.h', 'null_transport.cc', 'null_transport.h', - 'random.cc', - 'random.h', 'rtp_rtcp_observer.h', 'run_loop.cc', 'run_loop.h', @@ -62,13 +60,14 @@ }], ], 'dependencies': [ + '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/base/base.gyp:rtc_base', '<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/modules/modules.gyp:media_file', '<(webrtc_root)/modules/modules.gyp:video_render', - '<(webrtc_root)/test/test.gyp:frame_generator', + '<(webrtc_root)/test/test.gyp:fake_video_frames', '<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/test/test.gyp:rtp_test_utils', '<(webrtc_root)/webrtc.gyp:webrtc', @@ -116,11 +115,24 @@ '<(directx_sdk_path)/Include', ], }], + ['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-bool-conversion', + '-Wno-comment', + '-Wno-delete-non-virtual-dtor', + ], + }, + }, + }], ], 'dependencies': [ '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/modules/modules.gyp:media_file', - '<(webrtc_root)/test/test.gyp:frame_generator', + '<(webrtc_root)/test/test.gyp:fake_video_frames', '<(webrtc_root)/test/test.gyp:test_support', ], 'direct_dependent_settings': { |