diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 00:53:44 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 00:53:44 +0000 |
| commit | 641092b6c8bc72c7d355e7ec6914c5c6152278a3 (patch) | |
| tree | 043d360319b632d886a995a7dd8fbd438f9974fd /third_party | |
| parent | 7470b729d0aaa587001ff81330b63ea65481e2f2 (diff) | |
| download | chromium_src-641092b6c8bc72c7d355e7ec6914c5c6152278a3.zip chromium_src-641092b6c8bc72c7d355e7ec6914c5c6152278a3.tar.gz chromium_src-641092b6c8bc72c7d355e7ec6914c5c6152278a3.tar.bz2 | |
Revert 108600 - Roll libjingle to 93:94.
* Add window.h, webrtcvideocapturer and dummydevicemanager for peerconnection.
* Reenable disabled parts of libjingle_peerconnection.
* Exclude the devicemanager from the build.
BUG=102012,102451
TEST=Compiles
Review URL: http://codereview.chromium.org/8438059
TBR=ronghuawu@chromium.org
Review URL: http://codereview.chromium.org/8451018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index e2e1744..020474f 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -469,13 +469,15 @@ 'source/talk/session/phone/cryptoparams.h', 'source/talk/session/phone/currentspeakermonitor.cc', 'source/talk/session/phone/currentspeakermonitor.h', - 'source/talk/session/phone/dummydevicemanager.cc', - 'source/talk/session/phone/dummydevicemanager.h', + # See http://crbug.com/102012 + # 'source/talk/session/phone/devicemanager.cc', + # 'source/talk/session/phone/devicemanager.h', 'source/talk/session/phone/filemediaengine.cc', 'source/talk/session/phone/filemediaengine.h', 'source/talk/session/phone/mediachannel.h', - 'source/talk/session/phone/mediaengine.cc', - 'source/talk/session/phone/mediaengine.h', + # See http://crbug.com/102451 + # 'source/talk/session/phone/mediaengine.cc', + # 'source/talk/session/phone/mediaengine.h', 'source/talk/session/phone/mediamessages.cc', 'source/talk/session/phone/mediamessages.h', 'source/talk/session/phone/mediamonitor.cc', @@ -493,21 +495,18 @@ 'source/talk/session/phone/rtputils.h', 'source/talk/session/phone/soundclip.cc', 'source/talk/session/phone/soundclip.h', - 'source/talk/session/phone/srtpfilter.cc', - 'source/talk/session/phone/srtpfilter.h', - 'source/talk/session/phone/videocapturer.cc', - 'source/talk/session/phone/videocapturer.h', - 'source/talk/session/phone/videocommon.cc', + # See http://crbug.com/102451 + # 'source/talk/session/phone/srtpfilter.cc', + # 'source/talk/session/phone/srtpfilter.h', 'source/talk/session/phone/videocommon.h', 'source/talk/session/phone/videoframe.cc', 'source/talk/session/phone/videoframe.h', 'source/talk/session/phone/voicechannel.h', 'source/talk/session/phone/webrtccommon.h', 'source/talk/session/phone/webrtcpassthroughrender.cc', - 'source/talk/session/phone/webrtcvideocapturer.cc', - 'source/talk/session/phone/webrtcvideocapturer.h', - 'source/talk/session/phone/webrtcvideoengine.cc', - 'source/talk/session/phone/webrtcvideoengine.h', + # See http://crbug.com/102451 + # 'source/talk/session/phone/webrtcvideoengine.cc', + # 'source/talk/session/phone/webrtcvideoengine.h', 'source/talk/session/phone/webrtcvideoframe.cc', 'source/talk/session/phone/webrtcvideoframe.h', 'source/talk/session/phone/webrtcvie.h', |