diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 00:38:32 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 00:38:32 +0000 |
| commit | 47283ad093402dfded81636647404c9e3ac7b342 (patch) | |
| tree | 3d7c3b2cf8fe4efc1cbd0ec8dd227e00bd4a991a /third_party | |
| parent | be55025eaabe9c2473bfccd84850ac64f2b145c6 (diff) | |
| download | chromium_src-47283ad093402dfded81636647404c9e3ac7b342.zip chromium_src-47283ad093402dfded81636647404c9e3ac7b342.tar.gz chromium_src-47283ad093402dfded81636647404c9e3ac7b342.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 020474f..e2e1744 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -469,15 +469,13 @@ 'source/talk/session/phone/cryptoparams.h', 'source/talk/session/phone/currentspeakermonitor.cc', 'source/talk/session/phone/currentspeakermonitor.h', - # See http://crbug.com/102012 - # 'source/talk/session/phone/devicemanager.cc', - # 'source/talk/session/phone/devicemanager.h', + 'source/talk/session/phone/dummydevicemanager.cc', + 'source/talk/session/phone/dummydevicemanager.h', 'source/talk/session/phone/filemediaengine.cc', 'source/talk/session/phone/filemediaengine.h', 'source/talk/session/phone/mediachannel.h', - # See http://crbug.com/102451 - # 'source/talk/session/phone/mediaengine.cc', - # 'source/talk/session/phone/mediaengine.h', + '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', @@ -495,18 +493,21 @@ 'source/talk/session/phone/rtputils.h', 'source/talk/session/phone/soundclip.cc', 'source/talk/session/phone/soundclip.h', - # See http://crbug.com/102451 - # 'source/talk/session/phone/srtpfilter.cc', - # 'source/talk/session/phone/srtpfilter.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', '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', - # See http://crbug.com/102451 - # 'source/talk/session/phone/webrtcvideoengine.cc', - # 'source/talk/session/phone/webrtcvideoengine.h', + 'source/talk/session/phone/webrtcvideocapturer.cc', + 'source/talk/session/phone/webrtcvideocapturer.h', + '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', |