diff options
| author | pbos <pbos@chromium.org> | 2015-06-11 03:08:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-11 10:08:51 +0000 |
| commit | aa45b79223b6239e03cb5840dd8033309025978f (patch) | |
| tree | 68560bb52bd02774263226ca33d7f534780a204a /third_party | |
| parent | 578b6959ef87e1f532145c2e15fde43af88f7624 (diff) | |
| download | chromium_src-aa45b79223b6239e03cb5840dd8033309025978f.zip chromium_src-aa45b79223b6239e03cb5840dd8033309025978f.tar.gz chromium_src-aa45b79223b6239e03cb5840dd8033309025978f.tar.bz2 | |
Roll WebRTC 9407:9413, Libjingle 9404:9415
WebRTC 9407:9413
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/53e1dff..e0cc456
Libjingle 9404:9415
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/9b056ad..8538c30
R=tommi@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1176313004
Cr-Commit-Position: refs/heads/master@{#333916}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/BUILD.gn | 2 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 23663d9..ad7e954 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -417,8 +417,6 @@ if (enable_webrtc) { "source/talk/media/base/constants.cc", "source/talk/media/base/constants.h", "source/talk/media/base/cryptoparams.h", - "source/talk/media/base/filemediaengine.cc", - "source/talk/media/base/filemediaengine.h", "source/talk/media/base/hybriddataengine.h", "source/talk/media/base/mediachannel.h", "source/talk/media/base/mediaengine.cc", diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 59e934e..1a217c8 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: 9404 +Revision: 9415 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 a415ae8..aec1019 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -401,8 +401,6 @@ '<(libjingle_source)/talk/media/base/constants.cc', '<(libjingle_source)/talk/media/base/constants.h', '<(libjingle_source)/talk/media/base/cryptoparams.h', - '<(libjingle_source)/talk/media/base/filemediaengine.cc', - '<(libjingle_source)/talk/media/base/filemediaengine.h', '<(libjingle_source)/talk/media/base/hybriddataengine.h', '<(libjingle_source)/talk/media/base/mediachannel.h', '<(libjingle_source)/talk/media/base/mediaengine.cc', |