Commit 646a59f7 authored by mcasas@chromium.org's avatar mcasas@chromium.org

roll webrtc 6825-6898 and add some missing files to libjingle gyp

TBR=sergeyu@chromium.org

BUG=

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

Cr-Commit-Position: refs/heads/master@{#289557}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289557 0039d316-1c4b-4281-b951-d872f2087c98
parent aa3ca1c1
...@@ -55,7 +55,7 @@ vars = { ...@@ -55,7 +55,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC # the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other. # and V8 without interference from each other.
"webrtc_revision": "6825", "webrtc_revision": "6898",
"jsoncpp_revision": "248", "jsoncpp_revision": "248",
"nss_revision": "287121", "nss_revision": "287121",
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
......
Name: libjingle Name: libjingle
URL: http://code.google.com/p/webrtc/ URL: http://code.google.com/p/webrtc/
Version: unknown Version: unknown
Revision: 6825 Revision: 6898
License: BSD License: BSD
License File: source/talk/COPYING License File: source/talk/COPYING
Security Critical: yes Security Critical: yes
......
...@@ -588,6 +588,8 @@ ...@@ -588,6 +588,8 @@
'<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc', '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h', '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h',
'<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.h',
'<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
'<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h', '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.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