diff options
| author | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 22:40:36 +0000 |
|---|---|---|
| committer | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 22:40:36 +0000 |
| commit | 3e975a787b7180d6eae63ca29f845af03edac32b (patch) | |
| tree | f82e8fa723d6868f8d9cc12817542a7cf0bcbd37 /third_party/libjingle | |
| parent | 43ea25e38344ed0a097e0b90245088892be61da8 (diff) | |
| download | chromium_src-3e975a787b7180d6eae63ca29f845af03edac32b.zip chromium_src-3e975a787b7180d6eae63ca29f845af03edac32b.tar.gz chromium_src-3e975a787b7180d6eae63ca29f845af03edac32b.tar.bz2 | |
Roll libjingle+webrtc to r5397.
R=sergeyu@chromium.org, wjia@chromium.org
TBR=phoglund@chromium.org
Review URL: https://codereview.chromium.org/134633004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index f6b4983..4a9f1d5 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 5301 +Revision: 5397 License: BSD License File: source/talk/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 11bb9bb..653686e 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -363,6 +363,8 @@ '<(libjingle_source)/talk/base/socketstream.h', '<(libjingle_source)/talk/base/ssladapter.cc', '<(libjingle_source)/talk/base/ssladapter.h', + '<(libjingle_source)/talk/base/sslfingerprint.cc', + '<(libjingle_source)/talk/base/sslfingerprint.h', '<(libjingle_source)/talk/base/sslidentity.cc', '<(libjingle_source)/talk/base/sslidentity.h', '<(libjingle_source)/talk/base/sslsocketfactory.cc', @@ -679,6 +681,8 @@ '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h', '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.cc', '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.h', + '<(libjingle_source)/talk/app/webrtc/sctputils.cc', + '<(libjingle_source)/talk/app/webrtc/sctputils.h', '<(libjingle_source)/talk/app/webrtc/statscollector.cc', '<(libjingle_source)/talk/app/webrtc/statscollector.h', '<(libjingle_source)/talk/app/webrtc/statstypes.h', @@ -733,8 +737,6 @@ '<(libjingle_source)/talk/media/devices/dummydevicemanager.h', '<(libjingle_source)/talk/media/devices/filevideocapturer.cc', '<(libjingle_source)/talk/media/devices/filevideocapturer.h', - '<(libjingle_source)/talk/media/sctp/sctputils.cc', - '<(libjingle_source)/talk/media/sctp/sctputils.h', '<(libjingle_source)/talk/media/webrtc/webrtccommon.h', '<(libjingle_source)/talk/media/webrtc/webrtcpassthroughrender.cc', '<(libjingle_source)/talk/media/webrtc/webrtcpassthroughrender.h', |