Roll libjingle to r124 and roll webrtc to 1888.

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'target_defaults': {
     'defines': [
@@ skipping 159 matching lines @@
 
         # Overrides logging.h/.cc because libjingle logging should be done to
         # the same place as the chromium logging.
         'overrides/talk/base/logging.cc',
         'overrides/talk/base/logging.h',
 
         'overrides/talk/base/scoped_ptr.h',
         
         # TODO(ronghuawu): Remove below overrides once below bug is fixed:
         # http://crbug.com/115702
-        'overrides/talk/base/byteorder.h',
         'overrides/talk/base/messagequeue.cc',
         'overrides/talk/base/messagequeue.h',
         'overrides/talk/base/thread.cc',
         'overrides/talk/base/thread.h',
 
         'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
         'source/talk/base/asyncfile.cc',
         'source/talk/base/asyncfile.h',
         'source/talk/base/asynchttprequest.cc',
         'source/talk/base/asynchttprequest.h',
         'source/talk/base/asyncpacketsocket.h',
         'source/talk/base/asyncsocket.cc',
         'source/talk/base/asyncsocket.h',
         'source/talk/base/asynctcpsocket.cc',
         'source/talk/base/asynctcpsocket.h',
         'source/talk/base/asyncudpsocket.cc',
         'source/talk/base/asyncudpsocket.h',
         'source/talk/base/autodetectproxy.cc',
         'source/talk/base/autodetectproxy.h',
         'source/talk/base/base64.cc',
         'source/talk/base/base64.h',
         'source/talk/base/basicdefs.h',
         'source/talk/base/basicpacketsocketfactory.cc',
         'source/talk/base/basicpacketsocketfactory.h',
         'source/talk/base/bytebuffer.cc',
         'source/talk/base/bytebuffer.h',
+        'source/talk/base/byteorder.h',
         'source/talk/base/checks.cc',
         'source/talk/base/checks.h',
         'source/talk/base/common.cc',
         'source/talk/base/common.h',
         'source/talk/base/criticalsection.h',
         'source/talk/base/cryptstring.h',
         'source/talk/base/diskcache.cc',
         'source/talk/base/diskcache.h',
         'source/talk/base/event.cc',
         'source/talk/base/event.h',
@@ skipping 16 matching lines @@
         'source/talk/base/httpcommon.h',
         'source/talk/base/httprequest.cc',
         'source/talk/base/httprequest.h',
         'source/talk/base/ipaddress.cc',
         'source/talk/base/ipaddress.h',
         'source/talk/base/json.cc',
         'source/talk/base/json.h',
         'source/talk/base/linked_ptr.h',
         'source/talk/base/md5.h',
         'source/talk/base/md5c.c',
+        'source/talk/base/messagedigest.cc',
+        'source/talk/base/messagedigest.h',
         'source/talk/base/messagehandler.cc',
         'source/talk/base/messagehandler.h',
         'source/talk/base/nethelpers.cc',
         'source/talk/base/nethelpers.h',
         'source/talk/base/network.cc',
         'source/talk/base/network.h',
+        'source/talk/base/nullsocketserver.h',
         'source/talk/base/pathutils.cc',
         'source/talk/base/pathutils.h',
         'source/talk/base/physicalsocketserver.cc',
         'source/talk/base/physicalsocketserver.h',
         'source/talk/base/proxydetect.cc',
         'source/talk/base/proxydetect.h',
         'source/talk/base/proxyinfo.cc',
         'source/talk/base/proxyinfo.h',
         'source/talk/base/ratetracker.cc',
         'source/talk/base/ratetracker.h',
         'source/talk/base/sec_buffer.h',
+        'source/talk/base/sha1.c',
+        'source/talk/base/sha1.h',
         'source/talk/base/signalthread.cc',
         'source/talk/base/signalthread.h',
         'source/talk/base/sigslot.h',
         'source/talk/base/sigslotrepeater.h',
         'source/talk/base/socket.h',
         'source/talk/base/socketadapters.cc',
         'source/talk/base/socketadapters.h',
         'source/talk/base/socketaddress.cc',
         'source/talk/base/socketaddress.h',
         'source/talk/base/socketaddresspair.cc',
         'source/talk/base/socketaddresspair.h',
         'source/talk/base/socketfactory.h',
         'source/talk/base/socketpool.cc',
         'source/talk/base/socketpool.h',
         'source/talk/base/socketserver.h',
         'source/talk/base/socketstream.cc',
         'source/talk/base/socketstream.h',
         'source/talk/base/ssladapter.cc',
         'source/talk/base/ssladapter.h',
         'source/talk/base/sslsocketfactory.cc',
         'source/talk/base/sslsocketfactory.h',
         'source/talk/base/stream.cc',
         'source/talk/base/stream.h',
-        'source/talk/base/stringdigest.cc',
-        'source/talk/base/stringdigest.h',
         'source/talk/base/stringencode.cc',
         'source/talk/base/stringencode.h',
         'source/talk/base/stringutils.cc',
         'source/talk/base/stringutils.h',
         'source/talk/base/task.cc',
         'source/talk/base/task.h',
         'source/talk/base/taskparent.cc',
         'source/talk/base/taskparent.h',
         'source/talk/base/taskrunner.cc',
         'source/talk/base/taskrunner.h',
@@ skipping 50 matching lines @@
       ],
       'export_dependent_settings': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'overrides/talk/base/win32socketinit.cc',
             'source/talk/base/schanneladapter.cc',
             'source/talk/base/schanneladapter.h',
-            # TODO(ronghuawu): Remove below overrides once below bug is fixed:
-            # http://crbug.com/115702
-            'overrides/talk/base/win32.h',
-            'overrides/talk/base/win32.cc',
+            'source/talk/base/win32.cc',
+            'source/talk/base/win32.h',
             'source/talk/base/win32filesystem.cc',
             'source/talk/base/win32filesystem.h',
             'source/talk/base/win32window.h',
             'source/talk/base/win32window.cc',
             'source/talk/base/win32securityerrors.cc',
             'source/talk/base/winfirewall.cc',
             'source/talk/base/winfirewall.h',
             'source/talk/base/winping.cc',
             'source/talk/base/winping.h',
           ],
         }],
         ['os_posix == 1', {
           'sources': [
+            'source/talk/base/openssladapter.cc',
+            'source/talk/base/openssladapter.h',
+            'source/talk/base/openssldigest.cc',
+            'source/talk/base/openssldigest.h',
             'source/talk/base/sslstreamadapter.cc',
             'source/talk/base/sslstreamadapter.h',
             'source/talk/base/unixfilesystem.cc',
             'source/talk/base/unixfilesystem.h',
           ],
         }],
         ['OS=="linux"', {
           'sources': [
             'source/talk/base/latebindingsymboltable.cc',
             'source/talk/base/latebindingsymboltable.h',
             'source/talk/base/linux.cc',
             'source/talk/base/linux.h',
           ],
         }],
         ['OS=="mac"', {
           'sources': [
             'source/talk/base/macconversion.cc',
             'source/talk/base/macconversion.h',
             'source/talk/base/macutils.cc',
             'source/talk/base/macutils.h',
           ],
         }],
         ['OS=="android"', {
           'sources!': [
+            # The openssl is not available in android build.
+            'source/talk/base/openssldigest.cc',
+            'source/talk/base/openssldigest.h',
             # These depend on jsoncpp which we don't load because we probably
             # don't actually need this code at all.
             'source/talk/base/json.cc',
             'source/talk/base/json.h',
           ],
           'dependencies!': [
             '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
           ],
         }],
       ],
@@ skipping 131 matching lines @@
         'source/talk/session/phone/audiomonitor.cc',
         'source/talk/session/phone/audiomonitor.h',
         'source/talk/session/phone/call.cc',
         'source/talk/session/phone/call.h',
         'source/talk/session/phone/channel.cc',
         'source/talk/session/phone/channel.h',
         'source/talk/session/phone/channelmanager.cc',
         'source/talk/session/phone/channelmanager.h',
         'source/talk/session/phone/codec.cc',
         'source/talk/session/phone/codec.h',
+        'source/talk/session/phone/constants.cc',
+        'source/talk/session/phone/constants.h',
         'source/talk/session/phone/cryptoparams.h',
         'source/talk/session/phone/currentspeakermonitor.cc',
         'source/talk/session/phone/currentspeakermonitor.h',
+        'source/talk/session/phone/dataengine.cc',
+        'source/talk/session/phone/dataengine.h',
         'source/talk/session/phone/devicemanager.cc',
         'source/talk/session/phone/devicemanager.h',
         'source/talk/session/phone/dummydevicemanager.cc',
         'source/talk/session/phone/dummydevicemanager.h',
         'source/talk/session/phone/filemediaengine.cc',
         'source/talk/session/phone/filemediaengine.h',
         'source/talk/session/phone/filevideocapturer.cc',
         'source/talk/session/phone/filevideocapturer.h',
         'source/talk/session/phone/mediachannel.h',
         'source/talk/session/phone/mediaengine.cc',
@@ skipping 51 matching lines @@
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             'libjingle',
             'libjingle_p2p',
           ],
         }],
       ],
     },  # target libjingle_peerconnection
   ],
 }