[go: nahoru, domu]

Roll WebRTC 9189:9205, Libjingle 9186:9198

WebRTC 9189:9205
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/872cf25..3c9a06a

Libjingle 9186:9198
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/a8c7824..87e6b84

TBR=sergeyu@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1129783004

Cr-Commit-Position: refs/heads/master@{#330366}
diff --git a/DEPS b/DEPS
index 5454457..84d0443b 100644
--- a/DEPS
+++ b/DEPS
@@ -204,7 +204,7 @@
    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'c0f05636c4472e5d3c0045ec34464aec46c5fb70',
 
   'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'a8c78249e7843c24bf24be555eae7fe9e49ef9b8', # commit position 9186
+    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '87e6b84cc5850996fe090bf825179b04a9fcf0ed', # commit position 9198
 
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215
@@ -228,7 +228,7 @@
    Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
 
   'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '872cf25862abf08286abd5c73cc30044ac19b033', # commit position 9189
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '3c9a06a1cfbfdd1a28f6a0def3dda736b5ea516d', # commit position 9205
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 6028000d..f0dc85a 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: 9186
+Revision: 9198
 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 edcbdd29..1ca1e81 100644
--- a/third_party/libjingle/libjingle_nacl.gyp
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -156,6 +156,8 @@
         '<(webrtc_base)/pathutils.h',
         '<(webrtc_base)/physicalsocketserver.cc',
         '<(webrtc_base)/physicalsocketserver.h',
+        '<(webrtc_base)/platform_thread.cc',
+        '<(webrtc_base)/platform_thread.h',
         '<(webrtc_base)/proxydetect.cc',
         '<(webrtc_base)/proxydetect.h',
         '<(webrtc_base)/proxyinfo.cc',