diff options
| author | tommi <tommi@chromium.org> | 2016-03-19 10:53:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-19 17:54:57 +0000 |
| commit | acabf36819da301f3f0e4b933f7fa798ab448fae (patch) | |
| tree | 7489ecbc0ddbb1ac05317d766993311b0455f7b9 /third_party/libjingle | |
| parent | 1542c55c9336e05e1edb46ae7ff8890cc14abeea (diff) | |
| download | chromium_src-acabf36819da301f3f0e4b933f7fa798ab448fae.zip chromium_src-acabf36819da301f3f0e4b933f7fa798ab448fae.tar.gz chromium_src-acabf36819da301f3f0e4b933f7fa798ab448fae.tar.bz2 | |
Roll WebRTC 12049:12058, Libjingle 12042:12058
WebRTC 12049:12058
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/957d599..0912ecc
Libjingle 12042:12058
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/8bc093b..35814a7
TBR=jbauch@webrtc.org
BUG=
Review URL: https://codereview.chromium.org/1822473002
Cr-Commit-Position: refs/heads/master@{#382204}
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_nacl.gyp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index f507e36..6905414 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://www.webrtc.org Version: unknown -Revision: 12042 +Revision: 12058 License: BSD License File: source/talk/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp index 81742ba..bb4b620 100644 --- a/third_party/libjingle/libjingle_nacl.gyp +++ b/third_party/libjingle/libjingle_nacl.gyp @@ -73,6 +73,8 @@ '<(webrtc_base)/base64.h', '<(webrtc_base)/buffer.cc', '<(webrtc_base)/buffer.h', + '<(webrtc_base)/copyonwritebuffer.cc', + '<(webrtc_base)/copyonwritebuffer.h', '<(webrtc_base)/bytebuffer.cc', '<(webrtc_base)/bytebuffer.h', '<(webrtc_base)/byteorder.h', |