diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 18:02:26 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 18:02:26 +0000 |
| commit | 545dd93c61b3c0ce100b628a11d920fab19fe9b0 (patch) | |
| tree | a51cebb572f2d634d9f1aa5af954d49432065589 /content/content_renderer.gypi | |
| parent | 4c143eb76a23a31c118fc665045b613feb21e220 (diff) | |
| download | chromium_src-545dd93c61b3c0ce100b628a11d920fab19fe9b0.zip chromium_src-545dd93c61b3c0ce100b628a11d920fab19fe9b0.tar.gz chromium_src-545dd93c61b3c0ce100b628a11d920fab19fe9b0.tar.bz2 | |
move more files and dependency to enable_webrtc==1
BUG=110581
TEST=no webrtc is built when enable_webrtc=0
Review URL: https://chromiumcodereview.appspot.com/9278001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_renderer.gypi')
| -rw-r--r-- | content/content_renderer.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index e89aa11..36c0ac9 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -14,7 +14,6 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libjingle/libjingle.gyp:libjingle_p2p', - '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/gfx/surface/surface.gyp:surface', @@ -114,8 +113,6 @@ 'renderer/media/media_stream_dispatcher.h', 'renderer/media/media_stream_dispatcher_eventhandler.h', 'renderer/media/media_stream_impl.h', - 'renderer/media/peer_connection_handler.cc', - 'renderer/media/peer_connection_handler.h', 'renderer/media/render_media_log.cc', 'renderer/media/render_media_log.h', 'renderer/media/rtc_video_decoder.cc', @@ -262,6 +259,7 @@ }], ['enable_webrtc==1', { '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', @@ -270,6 +268,8 @@ 'sources': [ 'renderer/media/media_stream_dependency_factory.cc', 'renderer/media/media_stream_impl.cc', + 'renderer/media/peer_connection_handler.cc', + 'renderer/media/peer_connection_handler.h', 'renderer/media/video_capture_module_impl.cc', 'renderer/media/video_capture_module_impl.h', 'renderer/media/webrtc_audio_device_impl.cc', |