Commit 48783fe6 authored by tommi's avatar tommi Committed by Commit bot

Roll WebRTC 9229:9238, Libjingle 9227:9240

WebRTC 9229:9238
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/ead3df8..b7c7010

Libjingle 9227:9240
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/88eeffa..dd7a408

R=kjellander@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#330914}
parent 8abf4df0
...@@ -204,7 +204,7 @@ deps = { ...@@ -204,7 +204,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'c0f05636c4472e5d3c0045ec34464aec46c5fb70', Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'c0f05636c4472e5d3c0045ec34464aec46c5fb70',
'src/third_party/libjingle/source/talk': 'src/third_party/libjingle/source/talk':
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '88eeffa78665d3ad12e998536693774758c8b976', # commit position 9227 Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'dd7a408f8f4fd8dfd445e3791d4112e4108b7ff8', # commit position 9240
'src/third_party/usrsctp/usrsctplib': 'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215
...@@ -228,7 +228,7 @@ deps = { ...@@ -228,7 +228,7 @@ deps = {
Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
'src/third_party/webrtc': 'src/third_party/webrtc':
Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'ead3df884eaf5d3e2fe65d7080a9aab057979504', # commit position 9229 Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'b7c7010546e127129c48fa5478ce4c2ec3170ee7', # commit position 9238
'src/third_party/openmax_dl': 'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
......
Name: libjingle Name: libjingle
URL: http://code.google.com/p/webrtc/ URL: http://code.google.com/p/webrtc/
Version: unknown Version: unknown
Revision: 9227 Revision: 9240
License: BSD License: BSD
License File: source/talk/COPYING License File: source/talk/COPYING
Security Critical: yes Security Critical: yes
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
'HAVE_SRTP', 'HAVE_SRTP',
'HAVE_WEBRTC_VIDEO', 'HAVE_WEBRTC_VIDEO',
'HAVE_WEBRTC_VOICE', 'HAVE_WEBRTC_VOICE',
'LIBPEERCONNECTION_LIB=1',
'LOGGING_INSIDE_WEBRTC', 'LOGGING_INSIDE_WEBRTC',
'NO_MAIN_THREAD_WRAPPING', 'NO_MAIN_THREAD_WRAPPING',
'NO_SOUND_SYSTEM', 'NO_SOUND_SYSTEM',
...@@ -325,9 +324,6 @@ ...@@ -325,9 +324,6 @@
# GN version: //third_party/libjingle:libjingle_webrtc_common # GN version: //third_party/libjingle:libjingle_webrtc_common
'target_name': 'libjingle_webrtc_common', 'target_name': 'libjingle_webrtc_common',
'type': 'static_library', 'type': 'static_library',
'all_dependent_settings': {
'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
},
'sources': [ 'sources': [
'<(libjingle_source)/talk/app/webrtc/audiotrack.cc', '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
'<(libjingle_source)/talk/app/webrtc/audiotrack.h', '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment