summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 00:25:21 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 00:25:21 +0000
commit9b39978cfcecdce11ea3e73d276b57e2c4ffecd0 (patch)
treeb6d13a4d73793d08a7b6780d005c54c5ddfeabcc /third_party
parentdeb5d129ba349fb0bc1fd9b27010ef9d8f9cbd45 (diff)
downloadchromium_src-9b39978cfcecdce11ea3e73d276b57e2c4ffecd0.zip
chromium_src-9b39978cfcecdce11ea3e73d276b57e2c4ffecd0.tar.gz
chromium_src-9b39978cfcecdce11ea3e73d276b57e2c4ffecd0.tar.bz2
Libjingle roll 129:132.
BUG=121613 Review URL: https://chromiumcodereview.appspot.com/10024032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp7
2 files changed, 6 insertions, 3 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 46633b5..8561dc4 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication.
Short Name: libjingle
URL: http://code.google.com/p/libjingle/
Version: 0.6.17
-Revision: 126
+Revision: 131
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 4491d27..e41a569 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -285,6 +285,8 @@
'source/talk/base/ssladapter.h',
'source/talk/base/sslsocketfactory.cc',
'source/talk/base/sslsocketfactory.h',
+ 'source/talk/base/sslstreamadapter.cc',
+ 'source/talk/base/sslstreamadapter.h',
'source/talk/base/stream.cc',
'source/talk/base/stream.h',
'source/talk/base/stringencode.cc',
@@ -376,8 +378,6 @@
'source/talk/base/openssladapter.h',
'source/talk/base/openssldigest.cc',
'source/talk/base/openssldigest.h',
- 'source/talk/base/sslstreamadapter.cc',
- 'source/talk/base/sslstreamadapter.h',
'source/talk/base/unixfilesystem.cc',
'source/talk/base/unixfilesystem.h',
],
@@ -426,6 +426,9 @@
'source/talk/p2p/base/common.h',
'source/talk/p2p/base/constants.cc',
'source/talk/p2p/base/constants.h',
+ 'source/talk/p2p/base/dtlstransport.h',
+ 'source/talk/p2p/base/dtlstransportchannel.cc',
+ 'source/talk/p2p/base/dtlstransportchannel.h',
'source/talk/p2p/base/p2ptransport.cc',
'source/talk/p2p/base/p2ptransport.h',
'source/talk/p2p/base/p2ptransportchannel.cc',