summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-07 04:15:32 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-07 04:15:32 +0000
commit4c989feff53d779dd56527e0243e709a2d33a5ea (patch)
tree02c61d25e8ac0bfd5f7fe919bde0a2b19ab87d64
parentd4e82581ef735e063efb048e021406e7363e8793 (diff)
downloadchromium_src-4c989feff53d779dd56527e0243e709a2d33a5ea.zip
chromium_src-4c989feff53d779dd56527e0243e709a2d33a5ea.tar.gz
chromium_src-4c989feff53d779dd56527e0243e709a2d33a5ea.tar.bz2
Roll libjingle 288:291
Review URL: https://codereview.chromium.org/12555002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186613 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp2
3 files changed, 2 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 89ac05b..a2f1890 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,7 @@ vars = {
"nacl_tools_revision": "10001", # native_client/DEPS: tools_rev
"gtm_revision": "578",
- "libjingle_revision": "288",
+ "libjingle_revision": "291",
"libphonenumber_revision": "456",
"libvpx_revision": "180104",
"lss_revision": "18",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 48fa0a0..bb6325f 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/libjingle/
Version: unknown
-Revision: 288
+Revision: 291
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 418e4ee..304e829 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -645,7 +645,6 @@
'<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.cc',
'<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.h',
'<(libjingle_source)/talk/app/webrtc/mediastreamtrack.h',
- '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.cc',
'<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.h',
'<(libjingle_source)/talk/app/webrtc/notifier.h',
'<(libjingle_source)/talk/app/webrtc/peerconnection.cc',
@@ -660,7 +659,6 @@
'<(libjingle_source)/talk/app/webrtc/statstypes.h',
'<(libjingle_source)/talk/app/webrtc/streamcollection.h',
'<(libjingle_source)/talk/app/webrtc/videosourceinterface.h',
- '<(libjingle_source)/talk/app/webrtc/videosourceproxy.cc',
'<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
'<(libjingle_source)/talk/app/webrtc/videotrack.cc',
'<(libjingle_source)/talk/app/webrtc/videotrack.h',