Refactor libjingle.gyp:

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',
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
+    'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
-    'libjingle_peerconnection_additional_deps%': [],
+    'libpeer_target_type%': 'static_library',
   },
   'target_defaults': {
     'defines': [
       'EXPAT_RELATIVE_PATH',
       'FEATURE_ENABLE_SSL',
       'GTEST_RELATIVE_PATH',
       'HAVE_SRTP',
       'HAVE_WEBRTC_VIDEO',
       'HAVE_WEBRTC_VOICE',
       'JSONCPP_RELATIVE_PATH',
@@ skipping 55 matching lines @@
               '-lcrypt32.lib',
               '-liphlpapi.lib',
             ],
           },
         }],
         ['OS=="win"', {
           'include_dirs': [
             '../third_party/platformsdk_win7/files/Include',
           ],
           'defines': [
-              '_CRT_SECURE_NO_WARNINGS',  # Suppres warnings about _vsnprinf
+            '_CRT_SECURE_NO_WARNINGS',  # Suppres warnings about _vsnprinf
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267 ],
         }],
         ['OS=="linux"', {
           'defines': [
             'LINUX',
           ],
         }],
         ['OS=="mac"', {
@@ skipping 33 matching lines @@
         'Debug': {
           'defines': [
             # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
             # _DEBUG and remove this define. See above as well.
             '_DEBUG',
           ],
         }
       },
     },
     'conditions': [
+      ['"<(libpeer_target_type)"=="static_library"', {
+        'defines': [ 'LIBPEER_LIB=1' ],
+      }],
       ['use_openssl==1', {
         'defines': [
           'SSL_USE_OPENSSL',
           'HAVE_OPENSSL_SSL_H',
         ],
         'dependencies': [
           '../../third_party/openssl/openssl.gyp:openssl',
         ],
       }, {
         'defines': [
@@ skipping 127 matching lines @@
         '<(libjingle_source)/talk/base/firewallsocketserver.cc',
         '<(libjingle_source)/talk/base/firewallsocketserver.h',
         '<(libjingle_source)/talk/base/flags.cc',
         '<(libjingle_source)/talk/base/flags.h',
         '<(libjingle_source)/talk/base/helpers.cc',
         '<(libjingle_source)/talk/base/helpers.h',
         '<(libjingle_source)/talk/base/host.cc',
         '<(libjingle_source)/talk/base/host.h',
         '<(libjingle_source)/talk/base/httpbase.cc',
         '<(libjingle_source)/talk/base/httpbase.h',
+        '<(libjingle_source)/talk/base/httpclient.cc',
         '<(libjingle_source)/talk/base/httpclient.h',
-        '<(libjingle_source)/talk/base/httpclient.cc',
         '<(libjingle_source)/talk/base/httpcommon-inl.h',
         '<(libjingle_source)/talk/base/httpcommon.cc',
         '<(libjingle_source)/talk/base/httpcommon.h',
         '<(libjingle_source)/talk/base/httprequest.cc',
         '<(libjingle_source)/talk/base/httprequest.h',
         '<(libjingle_source)/talk/base/ipaddress.cc',
         '<(libjingle_source)/talk/base/ipaddress.h',
         '<(libjingle_source)/talk/base/json.cc',
         '<(libjingle_source)/talk/base/json.h',
         '<(libjingle_source)/talk/base/linked_ptr.h',
         '<(libjingle_source)/talk/base/md5.cc',
         '<(libjingle_source)/talk/base/md5.h',
         '<(libjingle_source)/talk/base/md5digest.h',
         '<(libjingle_source)/talk/base/messagedigest.cc',
         '<(libjingle_source)/talk/base/messagedigest.h',
         '<(libjingle_source)/talk/base/messagehandler.cc',
         '<(libjingle_source)/talk/base/messagehandler.h',
         '<(libjingle_source)/talk/base/messagequeue.cc',
         '<(libjingle_source)/talk/base/messagequeue.h',
         '<(libjingle_source)/talk/base/nethelpers.cc',
         '<(libjingle_source)/talk/base/nethelpers.h',
         '<(libjingle_source)/talk/base/network.cc',
         '<(libjingle_source)/talk/base/network.h',
-        '<(libjingle_source)/talk/base/nullsocketserver.h',
         '<(libjingle_source)/talk/base/nssidentity.cc',
         '<(libjingle_source)/talk/base/nssidentity.h',
         '<(libjingle_source)/talk/base/nssstreamadapter.cc',
         '<(libjingle_source)/talk/base/nssstreamadapter.h',
+        '<(libjingle_source)/talk/base/nullsocketserver.h',
         '<(libjingle_source)/talk/base/pathutils.cc',
         '<(libjingle_source)/talk/base/pathutils.h',
         '<(libjingle_source)/talk/base/physicalsocketserver.cc',
         '<(libjingle_source)/talk/base/physicalsocketserver.h',
         '<(libjingle_source)/talk/base/proxydetect.cc',
         '<(libjingle_source)/talk/base/proxydetect.h',
         '<(libjingle_source)/talk/base/proxyinfo.cc',
         '<(libjingle_source)/talk/base/proxyinfo.h',
         '<(libjingle_source)/talk/base/ratelimiter.cc',
         '<(libjingle_source)/talk/base/ratelimiter.h',
@@ skipping 46 matching lines @@
         '<(libjingle_source)/talk/base/thread.cc',
         '<(libjingle_source)/talk/base/thread.h',
         '<(libjingle_source)/talk/base/timeutils.cc',
         '<(libjingle_source)/talk/base/timeutils.h',
         '<(libjingle_source)/talk/base/timing.cc',
         '<(libjingle_source)/talk/base/timing.h',
         '<(libjingle_source)/talk/base/urlencode.cc',
         '<(libjingle_source)/talk/base/urlencode.h',
         '<(libjingle_source)/talk/base/worker.cc',
         '<(libjingle_source)/talk/base/worker.h',
+        '<(libjingle_source)/talk/p2p/base/candidate.h',
+        '<(libjingle_source)/talk/p2p/base/common.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/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/xmllite/qname.cc',
         '<(libjingle_source)/talk/xmllite/qname.h',
         '<(libjingle_source)/talk/xmllite/xmlbuilder.cc',
         '<(libjingle_source)/talk/xmllite/xmlbuilder.h',
         '<(libjingle_source)/talk/xmllite/xmlconstants.cc',
         '<(libjingle_source)/talk/xmllite/xmlconstants.h',
         '<(libjingle_source)/talk/xmllite/xmlelement.cc',
         '<(libjingle_source)/talk/xmllite/xmlelement.h',
         '<(libjingle_source)/talk/xmllite/xmlnsstack.cc',
         '<(libjingle_source)/talk/xmllite/xmlnsstack.h',
@@ skipping 22 matching lines @@
         '<(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',
       ],
       'dependencies': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+        'libjingle_p2p_constants',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'overrides/talk/base/win32socketinit.cc',
             '<(libjingle_source)/talk/base/schanneladapter.cc',
             '<(libjingle_source)/talk/base/schanneladapter.h',
@@ skipping 56 matching lines @@
         ['use_openssl==1', {
           'sources': [
             '<(libjingle_source)/talk/base/openssladapter.cc',
             '<(libjingle_source)/talk/base/openssldigest.cc',
             '<(libjingle_source)/talk/base/opensslidentity.cc',
             '<(libjingle_source)/talk/base/opensslstreamadapter.cc',
           ],
         }],
       ],
     },  # target libjingle
-    # This has to be is a separate project due to a bug in MSVS:
-    # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplicate-cpp-filename-in-c-project-visual-studio-2008
-    # We have two files named "constants.cc" and MSVS doesn't handle this
-    # properly.
+    # 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).
     {
-      'target_name': 'libjingle_p2p',
+      'target_name': 'libjingle_p2p_constants',
       'type': 'static_library',
       'sources': [
-        '<(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/port.cc',
-        '<(libjingle_source)/talk/p2p/base/port.h',
-        '<(libjingle_source)/talk/p2p/base/portallocator.h',
-        '<(libjingle_source)/talk/p2p/base/portallocator.cc',
-        '<(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/parsing.cc',
-        '<(libjingle_source)/talk/p2p/base/parsing.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/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/session/tunnel/pseudotcpchannel.cc',
-        '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
-        '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
-        '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
       ],
-      'dependencies': [
-        'libjingle',
-      ],
-    },  # target libjingle_p2p
+    },  # target libjingle_p2p_constants
     {
       'target_name': 'peerconnection_server',
       'type': 'executable',
       'sources': [
         '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc',
         '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h',
         '<(libjingle_source)/talk/examples/peerconnection/server/main.cc',
         '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc',
         '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h',
         '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc',
         '<(libjingle_source)/talk/examples/peerconnection/server/utils.h',
       ],
       'include_dirs': [
         '<(libjingle_source)',
       ],
       'dependencies': [
         'libjingle',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4309, ],
     }, # target peerconnection_server
   ],
   'conditions': [
     ['enable_webrtc==1', {
       'targets': [
         {
-          'target_name': 'libjingle_peerconnection',
-          'type': 'static_library',
+          'target_name': 'libpeerconnection',
+          'type': '<(libpeer_target_type)',
+          'all_dependent_settings': {
+            'conditions': [
+              ['"<(libpeer_target_type)"=="static_library"', {
+                'defines': [ 'LIBPEER_LIB=1' ],

[Sergey Ulanov, 2013/03/05 22:12:03]

I think since you renamed the target, it's better to rename this define as well,
i.e. it should be LIBPEERCONNECTION_LIB.

[tommi (sloooow) - chröme, 2013/03/05 22:45:53]

Done.  I'm having problems with git cl upload though. Any hints (the master
branch is synced to head)?

d:\src\src>git cl upload "Rename macro"
Using 50% similarity for rename/copy detection. Override with --similarity.
fatal: Needed a single revision
Command "git rev-parse --verify Rename macro" failed.

+              }],
+            ],
+          },
           'sources': [
             '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
             '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
             '<(libjingle_source)/talk/app/webrtc/datachannel.cc',
             '<(libjingle_source)/talk/app/webrtc/datachannel.h',
             '<(libjingle_source)/talk/app/webrtc/dtmfsender.cc',
             '<(libjingle_source)/talk/app/webrtc/dtmfsender.h',
             '<(libjingle_source)/talk/app/webrtc/jsep.h',
             '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.cc',
             '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.h',
@@ skipping 16 matching lines @@
             '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.cc',
             '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.h',
             '<(libjingle_source)/talk/app/webrtc/notifier.h',
             '<(libjingle_source)/talk/app/webrtc/peerconnection.cc',
             '<(libjingle_source)/talk/app/webrtc/peerconnection.h',
             '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc',
             '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.h',
             '<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h',
             '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc',
             '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h',
+            '<(libjingle_source)/talk/app/webrtc/statscollector.cc',
             '<(libjingle_source)/talk/app/webrtc/statscollector.h',
-            '<(libjingle_source)/talk/app/webrtc/statscollector.cc',
             '<(libjingle_source)/talk/app/webrtc/statstypes.h',
             '<(libjingle_source)/talk/app/webrtc/streamcollection.h',
             '<(libjingle_source)/talk/app/webrtc/videosourceinterface.h',
+            '<(libjingle_source)/talk/app/webrtc/videosourceproxy.cc',
             '<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
-            '<(libjingle_source)/talk/app/webrtc/videosourceproxy.cc',
+            '<(libjingle_source)/talk/app/webrtc/videotrack.cc',
+            '<(libjingle_source)/talk/app/webrtc/videotrack.h',
             '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.cc',
             '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.h',
-            '<(libjingle_source)/talk/app/webrtc/videotrack.cc',
-            '<(libjingle_source)/talk/app/webrtc/videotrack.h',
             '<(libjingle_source)/talk/app/webrtc/webrtcsdp.cc',
             '<(libjingle_source)/talk/app/webrtc/webrtcsdp.h',
             '<(libjingle_source)/talk/app/webrtc/webrtcsession.cc',
             '<(libjingle_source)/talk/app/webrtc/webrtcsession.h',
             '<(libjingle_source)/talk/media/base/capturemanager.cc',
             '<(libjingle_source)/talk/media/base/capturemanager.h',
             '<(libjingle_source)/talk/media/base/capturerenderadapter.cc',
             '<(libjingle_source)/talk/media/base/capturerenderadapter.h',
             '<(libjingle_source)/talk/media/base/codec.cc',
             '<(libjingle_source)/talk/media/base/codec.h',
@@ skipping 16 matching lines @@
             '<(libjingle_source)/talk/media/base/videocapturer.cc',
             '<(libjingle_source)/talk/media/base/videocapturer.h',
             '<(libjingle_source)/talk/media/base/videocommon.cc',
             '<(libjingle_source)/talk/media/base/videocommon.h',
             '<(libjingle_source)/talk/media/base/videoframe.cc',
             '<(libjingle_source)/talk/media/base/videoframe.h',
             '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
             '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
             '<(libjingle_source)/talk/media/devices/filevideocapturer.cc',
             '<(libjingle_source)/talk/media/devices/filevideocapturer.h',
+            '<(libjingle_source)/talk/media/webrtc/webrtccommon.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcpassthroughrender.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideocapturer.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideocapturer.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoframe.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvideoframe.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvie.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvoe.h',
             '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
             '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtccommon.h',
             '<(libjingle_source)/talk/session/media/audiomonitor.cc',
             '<(libjingle_source)/talk/session/media/audiomonitor.h',
             '<(libjingle_source)/talk/session/media/call.cc',
             '<(libjingle_source)/talk/session/media/call.h',
             '<(libjingle_source)/talk/session/media/channel.cc',
             '<(libjingle_source)/talk/session/media/channel.h',
             '<(libjingle_source)/talk/session/media/channelmanager.cc',
             '<(libjingle_source)/talk/session/media/channelmanager.h',
             '<(libjingle_source)/talk/session/media/currentspeakermonitor.cc',
             '<(libjingle_source)/talk/session/media/currentspeakermonitor.h',
             '<(libjingle_source)/talk/session/media/mediamessages.cc',
             '<(libjingle_source)/talk/session/media/mediamessages.h',
             '<(libjingle_source)/talk/session/media/mediamonitor.cc',
             '<(libjingle_source)/talk/session/media/mediamonitor.h',
             '<(libjingle_source)/talk/session/media/mediasession.cc',
             '<(libjingle_source)/talk/session/media/mediasession.h',
             '<(libjingle_source)/talk/session/media/mediasessionclient.cc',
             '<(libjingle_source)/talk/session/media/mediasessionclient.h',
             '<(libjingle_source)/talk/session/media/mediasink.h',
             '<(libjingle_source)/talk/session/media/rtcpmuxfilter.cc',
             '<(libjingle_source)/talk/session/media/rtcpmuxfilter.h',
             '<(libjingle_source)/talk/session/media/soundclip.cc',
             '<(libjingle_source)/talk/session/media/soundclip.h',
             '<(libjingle_source)/talk/session/media/srtpfilter.cc',
             '<(libjingle_source)/talk/session/media/srtpfilter.h',
             '<(libjingle_source)/talk/session/media/ssrcmuxfilter.cc',
             '<(libjingle_source)/talk/session/media/ssrcmuxfilter.h',
+            '<(libjingle_source)/talk/session/media/typingmonitor.cc',
             '<(libjingle_source)/talk/session/media/typingmonitor.h',
-            '<(libjingle_source)/talk/session/media/typingmonitor.cc',
             '<(libjingle_source)/talk/session/media/voicechannel.h',
+            '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc',
+            '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
+            '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
+            '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
           ],
           'conditions': [
+            ['"<(libpeer_target_type)"=="shared_library"', {
+              # Used to control symbol export/import.
+              'defines': [ 'LIBPEERCONNECTION_IMPLEMENTATION=1' ],
+            }],
+            ['OS=="win" and "<(libpeer_target_type)"=="shared_library"', {
+              'link_settings': {
+                'libraries': [
+                  '-lsecur32.lib',
+                  '-lcrypt32.lib',
+                  '-liphlpapi.lib',
+                ],
+              },
+            }],
             ['enabled_libjingle_device_manager==1', {
               'sources!': [
                 '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
                 '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
               ],
               'sources': [
                 '<(libjingle_source)/talk/media/devices/devicemanager.cc',
                 '<(libjingle_source)/talk/media/devices/devicemanager.h',
                 '<(libjingle_source)/talk/sound/nullsoundsystem.cc',
                 '<(libjingle_source)/talk/sound/nullsoundsystem.h',
@@ skipping 58 matching lines @@
                     ],
                   },
                 }],
               ],
             }],
           ],
           'dependencies': [
             '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
+            '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
             '<(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_peerconnection_additional_deps)',
             'libjingle',
-            'libjingle_p2p',
           ],
-        },  # target libjingle_peerconnection
+        },  # target libpeerconnection
       ],
     }],
   ],
 }