Remove webrtc/test/webrtc_test_common.gyp

webrtc/test/test.gyp

Index: webrtc/test/test.gyp
diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index 32c5dc86593dd8d27665cd5e306902551eee74ec..ee3283ea6ad36949873d28b52c9a6f2fdab5ffe5 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -212,11 +212,17 @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         'channel_transport',
+        'test_common',
         'test_support_main',
+        '<(webrtc_root)/modules/modules.gyp:video_capture',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
+        'fake_network_pipe_unittest.cc',
+        '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',
@@ -240,6 +246,159 @@
         }],
       ],
     },
+   {
+     'target_name': 'test_common',
+     'type': 'static_library',
+     'sources': [
+       'call_test.cc',
+       'call_test.h',
+       'configurable_frame_size_encoder.cc',
+       'configurable_frame_size_encoder.h',
+       'constants.cc',
+       'constants.h',
+       'direct_transport.cc',
+       'direct_transport.h',
+       'drifting_clock.cc',
+       'drifting_clock.h',
+       'encoder_settings.cc',
+       'encoder_settings.h',
+       'fake_audio_device.cc',
+       'fake_audio_device.h',
+       'fake_decoder.cc',
+       'fake_decoder.h',
+       'fake_encoder.cc',
+       'fake_encoder.h',
+       'fake_network_pipe.cc',
+       'fake_network_pipe.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',
+       'rtp_rtcp_observer.h',
+       'run_loop.cc',
+       'run_loop.h',
+       'statistics.cc',
+       'statistics.h',
+       'vcm_capturer.cc',
+       'vcm_capturer.h',
+       'video_capturer.cc',
+       'video_capturer.h',
+       'win/run_loop_win.cc',
+     ],
+     'conditions': [
+       ['OS=="win"', {
+         'sources!': [
+           'run_loop.cc',
+         ],
+       }],
+     ],
+     '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)/webrtc.gyp:webrtc',
+       'rtp_test_utils',
+       'test_support',
+       'video_test_common',
+     ],
+    },
+    {
+     'target_name': 'test_renderer',
+     'type': 'static_library',
+     'sources': [
+       'gl/gl_renderer.cc',
+       'gl/gl_renderer.h',
+       'linux/glx_renderer.cc',
+       'linux/glx_renderer.h',
+       'linux/video_renderer_linux.cc',
+       'mac/video_renderer_mac.h',
+       'mac/video_renderer_mac.mm',
+       'null_platform_renderer.cc',
+       'video_renderer.cc',
+       'video_renderer.h',
+       'win/d3d_renderer.cc',
+       'win/d3d_renderer.h',
+     ],
+     'conditions': [
+       ['OS=="linux"', {
+         'sources!': [
+           'null_platform_renderer.cc',
+         ],
+       }],
+       ['OS=="mac"', {
+         'sources!': [
+           'null_platform_renderer.cc',
+         ],
+       }],
+       ['OS!="linux" and OS!="mac"', {
+         'sources!' : [
+           'gl/gl_renderer.cc',
+           'gl/gl_renderer.h',
+         ],
+       }],
+       ['OS=="win"', {
+         'sources!': [
+           'null_platform_renderer.cc',
+         ],
+         'include_dirs': [
+           '<(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',
+       'test_support',
+       'video_test_common',
+     ],
+     'direct_dependent_settings': {
+       'conditions': [
+         ['OS=="linux"', {
+           'libraries': [
+             '-lXext',
+             '-lX11',
+             '-lGL',
+           ],
+         }],
+         ['OS=="android"', {
+           'libraries' : [
+             '-lGLESv2', '-llog',
+           ],
+         }],
+         ['OS=="mac"', {
+           'xcode_settings' : {
+             'OTHER_LDFLAGS' : [
+               '-framework Cocoa',
+               '-framework OpenGL',
+               '-framework CoreVideo',
+             ],
+           },
+         }],
+       ],
+     },
+    },
   ],
   'conditions': [
     ['include_tests==1 and OS=="android"', {