Commit 161bc0d7 authored by wjia@chromium.org's avatar wjia@chromium.org

move more webrtc related files under enable_webrt=1

Review URL: https://chromiumcodereview.appspot.com/9317022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120008 0039d316-1c4b-4281-b951-d872f2087c98
parent bcd90448
......@@ -15,7 +15,6 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gfx/surface/surface.gyp:surface',
......@@ -61,14 +60,8 @@
'common/test_url_constants.h',
'gpu/gpu_idirect3d9_mock_win.cc',
'gpu/gpu_idirect3d9_mock_win.h',
'renderer/media/mock_media_stream_dependency_factory.cc',
'renderer/media/mock_media_stream_dependency_factory.h',
'renderer/media/mock_media_stream_dispatcher.cc',
'renderer/media/mock_media_stream_dispatcher.h',
'renderer/media/mock_media_stream_impl.cc',
'renderer/media/mock_media_stream_impl.h',
'renderer/media/mock_peer_connection_impl.cc',
'renderer/media/mock_peer_connection_impl.h',
'renderer/media/mock_web_peer_connection_handler_client.cc',
'renderer/media/mock_web_peer_connection_handler_client.h',
'renderer/mock_content_renderer_client.cc',
......@@ -124,10 +117,17 @@
'conditions': [
['enable_webrtc==1', {
'sources': [
'renderer/media/mock_media_stream_dependency_factory.cc',
'renderer/media/mock_media_stream_dependency_factory.h',
'renderer/media/mock_media_stream_impl.cc',
'renderer/media/mock_media_stream_impl.h',
'renderer/media/mock_peer_connection_impl.cc',
'renderer/media/mock_peer_connection_impl.h',
'test/webrtc_audio_device_test.cc',
'test/webrtc_audio_device_test.h',
],
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
'../third_party/webrtc/modules/modules.gyp:audio_device',
'../third_party/webrtc/modules/modules.gyp:video_capture_module',
'../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
......@@ -174,7 +174,6 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gfx/gl/gl.gyp:gl',
......@@ -278,12 +277,8 @@
'renderer/media/audio_renderer_impl_unittest.cc',
'renderer/media/capture_video_decoder_unittest.cc',
'renderer/media/media_stream_dispatcher_unittest.cc',
'renderer/media/media_stream_impl_unittest.cc',
'renderer/media/peer_connection_handler_unittest.cc',
'renderer/media/rtc_video_decoder_unittest.cc',
'renderer/media/video_capture_impl_unittest.cc',
'renderer/media/video_capture_message_filter_unittest.cc',
'renderer/media/webrtc_audio_device_unittest.cc',
'renderer/paint_aggregator_unittest.cc',
'renderer/pepper_plugin_delegate_impl_unittest.cc',
'renderer/v8_value_converter_impl_unittest.cc',
......@@ -293,12 +288,19 @@
],
'conditions': [
['enable_webrtc==1', {
'sources': [
'renderer/media/media_stream_impl_unittest.cc',
'renderer/media/peer_connection_handler_unittest.cc',
'renderer/media/rtc_video_decoder_unittest.cc',
'renderer/media/webrtc_audio_device_unittest.cc',
],
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
'../third_party/webrtc/modules/modules.gyp:video_capture_module',
'../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
'../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
],
]
}],
['input_speech==0', {
'sources/': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment