Roll WebRTC 7546:7549.

TBR=hellner@chromium.org
NOTRY=true
BUG=N/A

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

Cr-Commit-Position: refs/heads/master@{#301879}

5 files changed, 224 insertions, 285 deletions

diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 7d80631..38f0a02 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -129,124 +129,127 @@ group("jingle_deps") {
 
 # GYP version: third_party/libjingle.gyp:libjingle
 static_library("libjingle") {
+  p2p_dir = "../webrtc/p2p"
+  xmllite_dir = "../webrtc/libjingle/xmllite"
+  xmpp_dir = "../webrtc/libjingle/xmpp"
   sources = [
     # List from third_party/libjingle/libjingle_common.gypi
-    "source/talk/p2p/base/asyncstuntcpsocket.cc",
-    "source/talk/p2p/base/asyncstuntcpsocket.h",
-    "source/talk/p2p/base/basicpacketsocketfactory.cc",
-    "source/talk/p2p/base/basicpacketsocketfactory.h",
-    "source/talk/p2p/base/candidate.h",
-    "source/talk/p2p/base/common.h",
-    "source/talk/p2p/base/constants.cc",
-    "source/talk/p2p/base/constants.h",
-    "source/talk/p2p/base/dtlstransport.h",
-    "source/talk/p2p/base/dtlstransportchannel.cc",
-    "source/talk/p2p/base/dtlstransportchannel.h",
-    "source/talk/p2p/base/p2ptransport.cc",
-    "source/talk/p2p/base/p2ptransport.h",
-    "source/talk/p2p/base/p2ptransportchannel.cc",
-    "source/talk/p2p/base/p2ptransportchannel.h",
-    "source/talk/p2p/base/parsing.cc",
-    "source/talk/p2p/base/parsing.h",
-    "source/talk/p2p/base/port.cc",
-    "source/talk/p2p/base/port.h",
-    "source/talk/p2p/base/portallocator.cc",
-    "source/talk/p2p/base/portallocator.h",
-    "source/talk/p2p/base/portallocatorsessionproxy.cc",
-    "source/talk/p2p/base/portallocatorsessionproxy.h",
-    "source/talk/p2p/base/portproxy.cc",
-    "source/talk/p2p/base/portproxy.h",
-    "source/talk/p2p/base/pseudotcp.cc",
-    "source/talk/p2p/base/pseudotcp.h",
-    "source/talk/p2p/base/rawtransport.cc",
-    "source/talk/p2p/base/rawtransport.h",
-    "source/talk/p2p/base/rawtransportchannel.cc",
-    "source/talk/p2p/base/rawtransportchannel.h",
-    "source/talk/p2p/base/relayport.cc",
-    "source/talk/p2p/base/relayport.h",
-    "source/talk/p2p/base/session.cc",
-    "source/talk/p2p/base/session.h",
-    "source/talk/p2p/base/sessionclient.h",
-    "source/talk/p2p/base/sessiondescription.cc",
-    "source/talk/p2p/base/sessiondescription.h",
-    "source/talk/p2p/base/sessionid.h",
-    "source/talk/p2p/base/sessionmanager.cc",
-    "source/talk/p2p/base/sessionmanager.h",
-    "source/talk/p2p/base/sessionmessages.cc",
-    "source/talk/p2p/base/sessionmessages.h",
-    "source/talk/p2p/base/stun.cc",
-    "source/talk/p2p/base/stun.h",
-    "source/talk/p2p/base/stunport.cc",
-    "source/talk/p2p/base/stunport.h",
-    "source/talk/p2p/base/stunrequest.cc",
-    "source/talk/p2p/base/stunrequest.h",
-    "source/talk/p2p/base/tcpport.cc",
-    "source/talk/p2p/base/tcpport.h",
-    "source/talk/p2p/base/transport.cc",
-    "source/talk/p2p/base/transport.h",
-    "source/talk/p2p/base/transportchannel.cc",
-    "source/talk/p2p/base/transportchannel.h",
-    "source/talk/p2p/base/transportchannelimpl.h",
-    "source/talk/p2p/base/transportchannelproxy.cc",
-    "source/talk/p2p/base/transportchannelproxy.h",
-    "source/talk/p2p/base/transportdescription.cc",
-    "source/talk/p2p/base/transportdescription.h",
-    "source/talk/p2p/base/transportdescriptionfactory.cc",
-    "source/talk/p2p/base/transportdescriptionfactory.h",
-    "source/talk/p2p/base/turnport.cc",
-    "source/talk/p2p/base/turnport.h",
-    "source/talk/p2p/client/basicportallocator.cc",
-    "source/talk/p2p/client/basicportallocator.h",
-    "source/talk/p2p/client/httpportallocator.cc",
-    "source/talk/p2p/client/httpportallocator.h",
-    "source/talk/p2p/client/sessionmanagertask.h",
-    "source/talk/p2p/client/sessionsendtask.h",
-    "source/talk/p2p/client/socketmonitor.cc",
-    "source/talk/p2p/client/socketmonitor.h",
-    "source/talk/xmllite/qname.cc",
-    "source/talk/xmllite/qname.h",
-    "source/talk/xmllite/xmlbuilder.cc",
-    "source/talk/xmllite/xmlbuilder.h",
-    "source/talk/xmllite/xmlconstants.cc",
-    "source/talk/xmllite/xmlconstants.h",
-    "source/talk/xmllite/xmlelement.cc",
-    "source/talk/xmllite/xmlelement.h",
-    "source/talk/xmllite/xmlnsstack.cc",
-    "source/talk/xmllite/xmlnsstack.h",
-    "source/talk/xmllite/xmlparser.cc",
-    "source/talk/xmllite/xmlparser.h",
-    "source/talk/xmllite/xmlprinter.cc",
-    "source/talk/xmllite/xmlprinter.h",
-    "source/talk/xmpp/asyncsocket.h",
-    "source/talk/xmpp/constants.cc",
-    "source/talk/xmpp/constants.h",
-    "source/talk/xmpp/jid.cc",
-    "source/talk/xmpp/jid.h",
-    "source/talk/xmpp/plainsaslhandler.h",
-    "source/talk/xmpp/prexmppauth.h",
-    "source/talk/xmpp/saslcookiemechanism.h",
-    "source/talk/xmpp/saslhandler.h",
-    "source/talk/xmpp/saslmechanism.cc",
-    "source/talk/xmpp/saslmechanism.h",
-    "source/talk/xmpp/saslplainmechanism.h",
-    "source/talk/xmpp/xmppclient.cc",
-    "source/talk/xmpp/xmppclient.h",
-    "source/talk/xmpp/xmppclientsettings.h",
-    "source/talk/xmpp/xmppengine.h",
-    "source/talk/xmpp/xmppengineimpl.cc",
-    "source/talk/xmpp/xmppengineimpl.h",
-    "source/talk/xmpp/xmppengineimpl_iq.cc",
-    "source/talk/xmpp/xmpplogintask.cc",
-    "source/talk/xmpp/xmpplogintask.h",
-    "source/talk/xmpp/xmppstanzaparser.cc",
-    "source/talk/xmpp/xmppstanzaparser.h",
-    "source/talk/xmpp/xmpptask.cc",
-    "source/talk/xmpp/xmpptask.h",
+    "$p2p_dir/base/asyncstuntcpsocket.cc",
+    "$p2p_dir/base/asyncstuntcpsocket.h",
+    "$p2p_dir/base/basicpacketsocketfactory.cc",
+    "$p2p_dir/base/basicpacketsocketfactory.h",
+    "$p2p_dir/base/candidate.h",
+    "$p2p_dir/base/common.h",
+    "$p2p_dir/base/constants.cc",
+    "$p2p_dir/base/constants.h",
+    "$p2p_dir/base/dtlstransport.h",
+    "$p2p_dir/base/dtlstransportchannel.cc",
+    "$p2p_dir/base/dtlstransportchannel.h",
+    "$p2p_dir/base/p2ptransport.cc",
+    "$p2p_dir/base/p2ptransport.h",
+    "$p2p_dir/base/p2ptransportchannel.cc",
+    "$p2p_dir/base/p2ptransportchannel.h",
+    "$p2p_dir/base/parsing.cc",
+    "$p2p_dir/base/parsing.h",
+    "$p2p_dir/base/port.cc",
+    "$p2p_dir/base/port.h",
+    "$p2p_dir/base/portallocator.cc",
+    "$p2p_dir/base/portallocator.h",
+    "$p2p_dir/base/portallocatorsessionproxy.cc",
+    "$p2p_dir/base/portallocatorsessionproxy.h",
+    "$p2p_dir/base/portproxy.cc",
+    "$p2p_dir/base/portproxy.h",
+    "$p2p_dir/base/pseudotcp.cc",
+    "$p2p_dir/base/pseudotcp.h",
+    "$p2p_dir/base/rawtransport.cc",
+    "$p2p_dir/base/rawtransport.h",
+    "$p2p_dir/base/rawtransportchannel.cc",
+    "$p2p_dir/base/rawtransportchannel.h",
+    "$p2p_dir/base/relayport.cc",
+    "$p2p_dir/base/relayport.h",
+    "$p2p_dir/base/session.cc",
+    "$p2p_dir/base/session.h",
+    "$p2p_dir/base/sessionclient.h",
+    "$p2p_dir/base/sessiondescription.cc",
+    "$p2p_dir/base/sessiondescription.h",
+    "$p2p_dir/base/sessionid.h",
+    "$p2p_dir/base/sessionmanager.cc",
+    "$p2p_dir/base/sessionmanager.h",
+    "$p2p_dir/base/sessionmessages.cc",
+    "$p2p_dir/base/sessionmessages.h",
+    "$p2p_dir/base/stun.cc",
+    "$p2p_dir/base/stun.h",
+    "$p2p_dir/base/stunport.cc",
+    "$p2p_dir/base/stunport.h",
+    "$p2p_dir/base/stunrequest.cc",
+    "$p2p_dir/base/stunrequest.h",
+    "$p2p_dir/base/tcpport.cc",
+    "$p2p_dir/base/tcpport.h",
+    "$p2p_dir/base/transport.cc",
+    "$p2p_dir/base/transport.h",
+    "$p2p_dir/base/transportchannel.cc",
+    "$p2p_dir/base/transportchannel.h",
+    "$p2p_dir/base/transportchannelimpl.h",
+    "$p2p_dir/base/transportchannelproxy.cc",
+    "$p2p_dir/base/transportchannelproxy.h",
+    "$p2p_dir/base/transportdescription.cc",
+    "$p2p_dir/base/transportdescription.h",
+    "$p2p_dir/base/transportdescriptionfactory.cc",
+    "$p2p_dir/base/transportdescriptionfactory.h",
+    "$p2p_dir/base/turnport.cc",
+    "$p2p_dir/base/turnport.h",
+    "$p2p_dir/client/basicportallocator.cc",
+    "$p2p_dir/client/basicportallocator.h",
+    "$p2p_dir/client/httpportallocator.cc",
+    "$p2p_dir/client/httpportallocator.h",
+    "$p2p_dir/client/sessionmanagertask.h",
+    "$p2p_dir/client/sessionsendtask.h",
+    "$p2p_dir/client/socketmonitor.cc",
+    "$p2p_dir/client/socketmonitor.h",
+    "$xmllite_dir/qname.cc",
+    "$xmllite_dir/qname.h",
+    "$xmllite_dir/xmlbuilder.cc",
+    "$xmllite_dir/xmlbuilder.h",
+    "$xmllite_dir/xmlconstants.cc",
+    "$xmllite_dir/xmlconstants.h",
+    "$xmllite_dir/xmlelement.cc",
+    "$xmllite_dir/xmlelement.h",
+    "$xmllite_dir/xmlnsstack.cc",
+    "$xmllite_dir/xmlnsstack.h",
+    "$xmllite_dir/xmlparser.cc",
+    "$xmllite_dir/xmlparser.h",
+    "$xmllite_dir/xmlprinter.cc",
+    "$xmllite_dir/xmlprinter.h",
+    "$xmpp_dir/asyncsocket.h",
+    "$xmpp_dir/constants.cc",
+    "$xmpp_dir/constants.h",
+    "$xmpp_dir/jid.cc",
+    "$xmpp_dir/jid.h",
+    "$xmpp_dir/plainsaslhandler.h",
+    "$xmpp_dir/prexmppauth.h",
+    "$xmpp_dir/saslcookiemechanism.h",
+    "$xmpp_dir/saslhandler.h",
+    "$xmpp_dir/saslmechanism.cc",
+    "$xmpp_dir/saslmechanism.h",
+    "$xmpp_dir/saslplainmechanism.h",
+    "$xmpp_dir/xmppclient.cc",
+    "$xmpp_dir/xmppclient.h",
+    "$xmpp_dir/xmppclientsettings.h",
+    "$xmpp_dir/xmppengine.h",
+    "$xmpp_dir/xmppengineimpl.cc",
+    "$xmpp_dir/xmppengineimpl.h",
+    "$xmpp_dir/xmppengineimpl_iq.cc",
+    "$xmpp_dir/xmpplogintask.cc",
+    "$xmpp_dir/xmpplogintask.h",
+    "$xmpp_dir/xmppstanzaparser.cc",
+    "$xmpp_dir/xmppstanzaparser.h",
+    "$xmpp_dir/xmpptask.cc",
+    "$xmpp_dir/xmpptask.h",
   ]
   sources -= [
     # Compiled as part of libjingle_p2p_constants.
-    "source/talk/p2p/base/constants.cc",
-    "source/talk/p2p/base/constants.h",
+    "$p2p_dir/base/constants.cc",
+    "$p2p_dir/base/constants.h",
   ]
   public_deps = [
     ":jingle_deps"
@@ -282,9 +285,10 @@ static_library("libjingle") {
 #
 # GYP version: third_party/libjingle.gyp:libjingle_p2p_constants
 static_library("libjingle_p2p_constants") {
+  p2p_dir = "../webrtc/p2p"
   sources = [
-    "source/talk/p2p/base/constants.cc",
-    "source/talk/p2p/base/constants.h",
+    "$p2p_dir/base/constants.cc",
+    "$p2p_dir/base/constants.h",
   ]
   public_deps = [
     ":jingle_deps",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 70a05ad..41c781e 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: 7546
+Revision: 7549
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 801d14346..1a1619b 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -268,37 +268,15 @@
     # GN version: //third_party/libjingle
     {
       'target_name': 'libjingle',
-      'type': 'static_library',
-      'includes': [ 'libjingle_common.gypi' ],
-      'sources!' : [
-        # Compiled as part of libjingle_p2p_constants.
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
+      'type': 'none',
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base',
         '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
-        'libjingle_p2p_constants',
+        '<(DEPTH)/third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
+        '<(DEPTH)/third_party/webrtc/p2p/p2p.gyp:rtc_p2p',
         '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
-    # This has to be is a separate project due to a bug in MSVS 2008 and the
-    # current toolset on android.  The problem is that we have two files named
-    # "constants.cc" and MSVS/android doesn't handle this properly.
-    # GYP currently has guards to catch this, so if you want to remove it,
-    # run GYP and if GYP has removed the validation check, then we can assume
-    # that the toolchains have been fixed (we currently use VS2010 and later,
-    # so VS2008 isn't a concern anymore).
-    #
-    # GN version: //third_party/libjingle:libjingle_p2p_constants
-    {
-      'target_name': 'libjingle_p2p_constants',
-      'type': 'static_library',
-      'sources': [
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
-    },  # target libjingle_p2p_constants
     # GN version: //third_party/libjingle:peerconnection_server
     {
       'target_name': 'peerconnection_server',
diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi
deleted file mode 100644
index eb9cbe6..0000000
--- a/third_party/libjingle/libjingle_common.gypi
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2014 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.
-
-{
-  'variables': {
-    'nacl_untrusted_build%': 0,
-  },
-  'sources': [
-    '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.cc',
-    '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.h',
-    '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.cc',
-    '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.h',
-    '<(libjingle_source)/talk/p2p/base/candidate.h',
-    '<(libjingle_source)/talk/p2p/base/common.h',
-    '<(libjingle_source)/talk/p2p/base/constants.cc',
-    '<(libjingle_source)/talk/p2p/base/constants.h',
-    '<(libjingle_source)/talk/p2p/base/dtlstransport.h',
-    '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/p2ptransport.cc',
-    '<(libjingle_source)/talk/p2p/base/p2ptransport.h',
-    '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/parsing.cc',
-    '<(libjingle_source)/talk/p2p/base/parsing.h',
-    '<(libjingle_source)/talk/p2p/base/port.cc',
-    '<(libjingle_source)/talk/p2p/base/port.h',
-    '<(libjingle_source)/talk/p2p/base/portallocator.cc',
-    '<(libjingle_source)/talk/p2p/base/portallocator.h',
-    '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.cc',
-    '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.h',
-    '<(libjingle_source)/talk/p2p/base/portproxy.cc',
-    '<(libjingle_source)/talk/p2p/base/portproxy.h',
-    '<(libjingle_source)/talk/p2p/base/pseudotcp.cc',
-    '<(libjingle_source)/talk/p2p/base/pseudotcp.h',
-    '<(libjingle_source)/talk/p2p/base/rawtransport.cc',
-    '<(libjingle_source)/talk/p2p/base/rawtransport.h',
-    '<(libjingle_source)/talk/p2p/base/rawtransportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/rawtransportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/relayport.cc',
-    '<(libjingle_source)/talk/p2p/base/relayport.h',
-    '<(libjingle_source)/talk/p2p/base/session.cc',
-    '<(libjingle_source)/talk/p2p/base/session.h',
-    '<(libjingle_source)/talk/p2p/base/sessionclient.h',
-    '<(libjingle_source)/talk/p2p/base/sessiondescription.cc',
-    '<(libjingle_source)/talk/p2p/base/sessiondescription.h',
-    '<(libjingle_source)/talk/p2p/base/sessionid.h',
-    '<(libjingle_source)/talk/p2p/base/sessionmanager.cc',
-    '<(libjingle_source)/talk/p2p/base/sessionmanager.h',
-    '<(libjingle_source)/talk/p2p/base/sessionmessages.cc',
-    '<(libjingle_source)/talk/p2p/base/sessionmessages.h',
-    '<(libjingle_source)/talk/p2p/base/stun.cc',
-    '<(libjingle_source)/talk/p2p/base/stun.h',
-    '<(libjingle_source)/talk/p2p/base/stunport.cc',
-    '<(libjingle_source)/talk/p2p/base/stunport.h',
-    '<(libjingle_source)/talk/p2p/base/stunrequest.cc',
-    '<(libjingle_source)/talk/p2p/base/stunrequest.h',
-    '<(libjingle_source)/talk/p2p/base/tcpport.cc',
-    '<(libjingle_source)/talk/p2p/base/tcpport.h',
-    '<(libjingle_source)/talk/p2p/base/transport.cc',
-    '<(libjingle_source)/talk/p2p/base/transport.h',
-    '<(libjingle_source)/talk/p2p/base/transportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/transportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/transportchannelimpl.h',
-    '<(libjingle_source)/talk/p2p/base/transportchannelproxy.cc',
-    '<(libjingle_source)/talk/p2p/base/transportchannelproxy.h',
-    '<(libjingle_source)/talk/p2p/base/transportdescription.cc',
-    '<(libjingle_source)/talk/p2p/base/transportdescription.h',
-    '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.cc',
-    '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.h',
-    '<(libjingle_source)/talk/p2p/base/turnport.cc',
-    '<(libjingle_source)/talk/p2p/base/turnport.h',
-    '<(libjingle_source)/talk/p2p/client/basicportallocator.cc',
-    '<(libjingle_source)/talk/p2p/client/basicportallocator.h',
-    '<(libjingle_source)/talk/p2p/client/httpportallocator.cc',
-    '<(libjingle_source)/talk/p2p/client/httpportallocator.h',
-    '<(libjingle_source)/talk/p2p/client/sessionmanagertask.h',
-    '<(libjingle_source)/talk/p2p/client/sessionsendtask.h',
-    '<(libjingle_source)/talk/p2p/client/socketmonitor.cc',
-    '<(libjingle_source)/talk/p2p/client/socketmonitor.h',
-    '<(libjingle_source)/talk/xmpp/asyncsocket.h',
-    '<(libjingle_source)/talk/xmpp/constants.cc',
-    '<(libjingle_source)/talk/xmpp/constants.h',
-    '<(libjingle_source)/talk/xmpp/jid.cc',
-    '<(libjingle_source)/talk/xmpp/jid.h',
-    '<(libjingle_source)/talk/xmpp/plainsaslhandler.h',
-    '<(libjingle_source)/talk/xmpp/prexmppauth.h',
-    '<(libjingle_source)/talk/xmpp/saslcookiemechanism.h',
-    '<(libjingle_source)/talk/xmpp/saslhandler.h',
-    '<(libjingle_source)/talk/xmpp/saslmechanism.cc',
-    '<(libjingle_source)/talk/xmpp/saslmechanism.h',
-    '<(libjingle_source)/talk/xmpp/saslplainmechanism.h',
-    '<(libjingle_source)/talk/xmpp/xmppclient.cc',
-    '<(libjingle_source)/talk/xmpp/xmppclient.h',
-    '<(libjingle_source)/talk/xmpp/xmppclientsettings.h',
-    '<(libjingle_source)/talk/xmpp/xmppengine.h',
-    '<(libjingle_source)/talk/xmpp/xmppengineimpl.cc',
-    '<(libjingle_source)/talk/xmpp/xmppengineimpl.h',
-    '<(libjingle_source)/talk/xmpp/xmppengineimpl_iq.cc',
-    '<(libjingle_source)/talk/xmpp/xmpplogintask.cc',
-    '<(libjingle_source)/talk/xmpp/xmpplogintask.h',
-    '<(libjingle_source)/talk/xmpp/xmppstanzaparser.cc',
-    '<(libjingle_source)/talk/xmpp/xmppstanzaparser.h',
-    '<(libjingle_source)/talk/xmpp/xmpptask.cc',
-    '<(libjingle_source)/talk/xmpp/xmpptask.h',
-  ],
-  'conditions': [
-    ['OS=="win" and nacl_untrusted_build==0', {
-      # Suppress warnings about WIN32_LEAN_AND_MEAN.
-      'msvs_disabled_warnings': [ 4005, 4267 ],
-    }, {
-      'sources/': [
-        ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
-        ['exclude', '/schanneladapter\\.(h|cc)$'],
-      ],
-    }],
-    ['os_posix!=1 and nacl_untrusted_build==0', {
-      'sources/': [
-        ['exclude', '/unix[a-z]+\\.(h|cc)$'],
-      ],
-    }],
-    ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
-      'sources/': [
-        ['exclude', '/mac[a-z]+\\.(h|cc)$'],
-        ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
-      ],
-    }],
-    ['use_openssl!=1', {
-      'sources/': [
-        ['exclude', '/openssl[a-z]+\\.(h|cc)$'],
-      ],
-    }],
-  ],
-}
diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp
index 9c474ef..a1db4b7 100644
--- a/third_party/libjingle/libjingle_nacl.gyp
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -6,7 +6,9 @@
   'variables': {
     'libjingle_source': "source",
     'webrtc_base': "../webrtc/base",
+    'webrtc_p2p': "../webrtc/p2p",
     'webrtc_xmllite': "../webrtc/libjingle/xmllite",
+    'webrtc_xmpp': "../webrtc/libjingle/xmpp",
   },
   'includes': [
     '../../native_client/build/untrusted.gypi',
@@ -57,7 +59,6 @@
         './<(libjingle_source)',
         '../',
       ],
-      'includes': ['libjingle_common.gypi', ],
       'sources': [
         '<(webrtc_base)/asyncfile.cc',
         '<(webrtc_base)/asyncfile.h',
@@ -231,6 +232,78 @@
         '<(webrtc_base)/winping.h',
         '<(webrtc_base)/worker.cc',
         '<(webrtc_base)/worker.h',
+        '<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
+        '<(webrtc_p2p)/base/asyncstuntcpsocket.h',
+        '<(webrtc_p2p)/base/basicpacketsocketfactory.cc',
+        '<(webrtc_p2p)/base/basicpacketsocketfactory.h',
+        '<(webrtc_p2p)/base/candidate.h',
+        '<(webrtc_p2p)/base/common.h',
+        '<(webrtc_p2p)/base/constants.cc',
+        '<(webrtc_p2p)/base/constants.h',
+        '<(webrtc_p2p)/base/dtlstransport.h',
+        '<(webrtc_p2p)/base/dtlstransportchannel.cc',
+        '<(webrtc_p2p)/base/dtlstransportchannel.h',
+        '<(webrtc_p2p)/base/p2ptransport.cc',
+        '<(webrtc_p2p)/base/p2ptransport.h',
+        '<(webrtc_p2p)/base/p2ptransportchannel.cc',
+        '<(webrtc_p2p)/base/p2ptransportchannel.h',
+        '<(webrtc_p2p)/base/parsing.cc',
+        '<(webrtc_p2p)/base/parsing.h',
+        '<(webrtc_p2p)/base/port.cc',
+        '<(webrtc_p2p)/base/port.h',
+        '<(webrtc_p2p)/base/portallocator.cc',
+        '<(webrtc_p2p)/base/portallocator.h',
+        '<(webrtc_p2p)/base/portallocatorsessionproxy.cc',
+        '<(webrtc_p2p)/base/portallocatorsessionproxy.h',
+        '<(webrtc_p2p)/base/portproxy.cc',
+        '<(webrtc_p2p)/base/portproxy.h',
+        '<(webrtc_p2p)/base/pseudotcp.cc',
+        '<(webrtc_p2p)/base/pseudotcp.h',
+        '<(webrtc_p2p)/base/rawtransport.cc',
+        '<(webrtc_p2p)/base/rawtransport.h',
+        '<(webrtc_p2p)/base/rawtransportchannel.cc',
+        '<(webrtc_p2p)/base/rawtransportchannel.h',
+        '<(webrtc_p2p)/base/relayport.cc',
+        '<(webrtc_p2p)/base/relayport.h',
+        '<(webrtc_p2p)/base/session.cc',
+        '<(webrtc_p2p)/base/session.h',
+        '<(webrtc_p2p)/base/sessionclient.h',
+        '<(webrtc_p2p)/base/sessiondescription.cc',
+        '<(webrtc_p2p)/base/sessiondescription.h',
+        '<(webrtc_p2p)/base/sessionid.h',
+        '<(webrtc_p2p)/base/sessionmanager.cc',
+        '<(webrtc_p2p)/base/sessionmanager.h',
+        '<(webrtc_p2p)/base/sessionmessages.cc',
+        '<(webrtc_p2p)/base/sessionmessages.h',
+        '<(webrtc_p2p)/base/stun.cc',
+        '<(webrtc_p2p)/base/stun.h',
+        '<(webrtc_p2p)/base/stunport.cc',
+        '<(webrtc_p2p)/base/stunport.h',
+        '<(webrtc_p2p)/base/stunrequest.cc',
+        '<(webrtc_p2p)/base/stunrequest.h',
+        '<(webrtc_p2p)/base/tcpport.cc',
+        '<(webrtc_p2p)/base/tcpport.h',
+        '<(webrtc_p2p)/base/transport.cc',
+        '<(webrtc_p2p)/base/transport.h',
+        '<(webrtc_p2p)/base/transportchannel.cc',
+        '<(webrtc_p2p)/base/transportchannel.h',
+        '<(webrtc_p2p)/base/transportchannelimpl.h',
+        '<(webrtc_p2p)/base/transportchannelproxy.cc',
+        '<(webrtc_p2p)/base/transportchannelproxy.h',
+        '<(webrtc_p2p)/base/transportdescription.cc',
+        '<(webrtc_p2p)/base/transportdescription.h',
+        '<(webrtc_p2p)/base/transportdescriptionfactory.cc',
+        '<(webrtc_p2p)/base/transportdescriptionfactory.h',
+        '<(webrtc_p2p)/base/turnport.cc',
+        '<(webrtc_p2p)/base/turnport.h',
+        '<(webrtc_p2p)/client/basicportallocator.cc',
+        '<(webrtc_p2p)/client/basicportallocator.h',
+        '<(webrtc_p2p)/client/httpportallocator.cc',
+        '<(webrtc_p2p)/client/httpportallocator.h',
+        '<(webrtc_p2p)/client/sessionmanagertask.h',
+        '<(webrtc_p2p)/client/sessionsendtask.h',
+        '<(webrtc_p2p)/client/socketmonitor.cc',
+        '<(webrtc_p2p)/client/socketmonitor.h',
         '<(webrtc_xmllite)/qname.cc',
         '<(webrtc_xmllite)/qname.h',
         '<(webrtc_xmllite)/xmlbuilder.cc',
@@ -245,6 +318,31 @@
         '<(webrtc_xmllite)/xmlparser.h',
         '<(webrtc_xmllite)/xmlprinter.cc',
         '<(webrtc_xmllite)/xmlprinter.h',
+        '<(webrtc_xmpp)/asyncsocket.h',
+        '<(webrtc_xmpp)/constants.cc',
+        '<(webrtc_xmpp)/constants.h',
+        '<(webrtc_xmpp)/jid.cc',
+        '<(webrtc_xmpp)/jid.h',
+        '<(webrtc_xmpp)/plainsaslhandler.h',
+        '<(webrtc_xmpp)/prexmppauth.h',
+        '<(webrtc_xmpp)/saslcookiemechanism.h',
+        '<(webrtc_xmpp)/saslhandler.h',
+        '<(webrtc_xmpp)/saslmechanism.cc',
+        '<(webrtc_xmpp)/saslmechanism.h',
+        '<(webrtc_xmpp)/saslplainmechanism.h',
+        '<(webrtc_xmpp)/xmppclient.cc',
+        '<(webrtc_xmpp)/xmppclient.h',
+        '<(webrtc_xmpp)/xmppclientsettings.h',
+        '<(webrtc_xmpp)/xmppengine.h',
+        '<(webrtc_xmpp)/xmppengineimpl.cc',
+        '<(webrtc_xmpp)/xmppengineimpl.h',
+        '<(webrtc_xmpp)/xmppengineimpl_iq.cc',
+        '<(webrtc_xmpp)/xmpplogintask.cc',
+        '<(webrtc_xmpp)/xmpplogintask.h',
+        '<(webrtc_xmpp)/xmppstanzaparser.cc',
+        '<(webrtc_xmpp)/xmppstanzaparser.h',
+        '<(webrtc_xmpp)/xmpptask.cc',
+        '<(webrtc_xmpp)/xmpptask.h',
       ],
       'sources!': [
         # Compiled as part of libjingle_p2p_constants_nacl.
@@ -254,14 +352,8 @@
       'sources/': [
         ['exclude', '/mac[a-z]+\\.(h|cc)$'],
         ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
-      ],
-      'conditions': [
-        ['OS!="win"', {
-          'sources/': [
-            ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
-            ['exclude', '/schanneladapter\\.(h|cc)$'],
-          ],
-        }],
+        ['exclude', '/schanneladapter\\.(h|cc)$'],
+        ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
       ],
       'direct_dependent_settings': {
         'include_dirs': [