Roll WebRTC 7546:7549.

third_party/libjingle/libjingle_nacl.gyp

 # 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': {
     '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',
   ],
   'targets': [
     {
       'target_name': 'libjingle_nacl',
       'type': 'none',
       'variables': {
         'nlib_target': 'libjingle_nacl.a',
         'nacl_untrusted_build': 1,
         'build_glibc': 0,
         'build_newlib': 0,
         'build_pnacl_newlib': 1,
         'use_openssl': 1,
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '<(DEPTH)/third_party/expat/expat_nacl.gyp:expat_nacl',
         '<(DEPTH)/third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
-        'libjingle_p2p_constants_nacl',
       ],
       'defines': [
         'EXPAT_RELATIVE_PATH',
         'FEATURE_ENABLE_SSL',
         'GTEST_RELATIVE_PATH',
         'HAVE_OPENSSL_SSL_H',
         'NO_MAIN_THREAD_WRAPPING',
         'NO_SOUND_SYSTEM',
         'POSIX',
         'WEBRTC_POSIX',
         'SRTP_RELATIVE_PATH',
         'SSL_USE_OPENSSL',
         'USE_WEBRTC_DEV_BRANCH',
         'timezone=_timezone',
       ],
       'configurations': {
         'Debug': {
           'defines': [
             # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
             # _DEBUG and remove this define. See below as well.
             '_DEBUG',
           ],
         }
       },
       'include_dirs': [
         './<(libjingle_source)',
         '../',
       ],
-      'includes': ['libjingle_common.gypi', ],
       'sources': [
         '<(webrtc_base)/asyncfile.cc',
         '<(webrtc_base)/asyncfile.h',
         '<(webrtc_base)/asynchttprequest.cc',
         '<(webrtc_base)/asynchttprequest.h',
         '<(webrtc_base)/asyncpacketsocket.h',
         '<(webrtc_base)/asyncsocket.cc',
         '<(webrtc_base)/asyncsocket.h',
         '<(webrtc_base)/asynctcpsocket.cc',
         '<(webrtc_base)/asynctcpsocket.h',
@@ skipping 153 matching lines @@
         '<(webrtc_base)/win32filesystem.h',
         '<(webrtc_base)/win32securityerrors.cc',
         '<(webrtc_base)/win32window.cc',
         '<(webrtc_base)/win32window.h',
         '<(webrtc_base)/winfirewall.cc',
         '<(webrtc_base)/winfirewall.h',
         '<(webrtc_base)/winping.cc',
         '<(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',
         '<(webrtc_xmllite)/xmlbuilder.h',
         '<(webrtc_xmllite)/xmlconstants.cc',
         '<(webrtc_xmllite)/xmlconstants.h',
         '<(webrtc_xmllite)/xmlelement.cc',
         '<(webrtc_xmllite)/xmlelement.h',
         '<(webrtc_xmllite)/xmlnsstack.cc',
         '<(webrtc_xmllite)/xmlnsstack.h',
         '<(webrtc_xmllite)/xmlparser.cc',
         '<(webrtc_xmllite)/xmlparser.h',
         '<(webrtc_xmllite)/xmlprinter.cc',
         '<(webrtc_xmllite)/xmlprinter.h',
-      ],
-      'sources!': [
-        # Compiled as part of libjingle_p2p_constants_nacl.
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.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/': [
         ['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)$'],
@@ skipping 18 matching lines @@
           'WEBRTC_POSIX',
           'SRTP_RELATIVE_PATH',
           'SSL_USE_OPENSSL',
           'USE_WEBRTC_DEV_BRANCH',
         ],
       },
       'export_dependent_settings': [
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
       ],
     },  # end of target 'libjingle_nacl'
-
-    {
-      'target_name': 'libjingle_p2p_constants_nacl',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libjingle_p2p_constants_nacl.a',
-        'build_glibc': 0,
-        'build_newlib': 1,
-        'build_pnacl_newlib': 1,
-      },
-      'configurations': {
-        'Debug': {
-          'defines': [
-            # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
-            # _DEBUG and remove this define. See below as well.
-            '_DEBUG',
-          ],
-        }
-      },
-      'include_dirs': [
-        './<(libjingle_source)',
-        '../'
-      ],
-      'sources': [
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
-    },  # end of target 'libjingle_p2p_constants_nacl'
   ],
 }