diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 21:54:33 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 21:54:33 +0000 |
| commit | 83f046a76bd730e63300fe64a2764f044c4ea2bc (patch) | |
| tree | d00d3eb5645533e301919970aa668d16646e4d08 /third_party/libjingle | |
| parent | 77c489485ad1a3e56984e6f17c636c8ed94d06f3 (diff) | |
| download | chromium_src-83f046a76bd730e63300fe64a2764f044c4ea2bc.zip chromium_src-83f046a76bd730e63300fe64a2764f044c4ea2bc.tar.gz chromium_src-83f046a76bd730e63300fe64a2764f044c4ea2bc.tar.bz2 | |
Roll libjingle to 93:95.
* 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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=108600
Review URL: http://codereview.chromium.org/8438059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -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', |