summaryrefslogtreecommitdiffstats
path: root/third_party/libjingle
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 00:08:26 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 00:08:26 +0000
commit4a6dd581892376ded12971b783324ea8bdb15d51 (patch)
tree89155c8cacb11b81b390f10759d33d71fae01ac0 /third_party/libjingle
parent04cb1148fc311b24c66b529aa8940fdb6020150f (diff)
downloadchromium_src-4a6dd581892376ded12971b783324ea8bdb15d51.zip
chromium_src-4a6dd581892376ded12971b783324ea8bdb15d51.tar.gz
chromium_src-4a6dd581892376ded12971b783324ea8bdb15d51.tar.bz2
Revert 245008 "Rolling webrtc/libjingle r5389."
Triggered browsertest and content unittest failures. http://build.chromium.org/p/chromium.memory/buildstatus?builder=Linux%20ASAN%20Tests%20%282%29&number=21803 http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.6%20Tests%20%28dbg%29%282%29&number=47773 > Rolling webrtc/libjingle r5389. > > R=jiayl@chromium.org, sergeyu@chromium.org, wjia@chromium.org > > Review URL: https://codereview.chromium.org/139853002 TBR=mallinath@chromium.org Review URL: https://codereview.chromium.org/140273003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
-rw-r--r--third_party/libjingle/README.chromium2
-rw-r--r--third_party/libjingle/libjingle.gyp4
2 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index ebee83e..f6b4983 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: 5389
+Revision: 5301
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 0f6ac7d..11bb9bb 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -679,8 +679,6 @@
'<(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',
@@ -735,6 +733,8 @@
'<(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',