Split the libpeerconnection target up in two parts. The new target, libjingle_webrtc contains all t…

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_additional_deps%': [],
     'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
-    'libpeer_target_type%': 'static_library',
+    'libpeer_target_type%': '<(component)',
   },
   'target_defaults': {
     'defines': [
       'EXPAT_RELATIVE_PATH',
       'FEATURE_ENABLE_SSL',
       'GTEST_RELATIVE_PATH',
       'HAVE_SRTP',
       'HAVE_WEBRTC_VIDEO',
       'HAVE_WEBRTC_VOICE',
       'JSONCPP_RELATIVE_PATH',
@@ skipping 577 matching lines @@
         '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': 'libpeerconnection',
-          'type': '<(libpeer_target_type)',
+          'target_name': 'libjingle_webrtc',
+          'type': 'static_library',
           'all_dependent_settings': {
             'conditions': [
               ['"<(libpeer_target_type)"=="static_library"', {
                 'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
               }],
             ],
           },
           'sources': [
             '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
             '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
@@ skipping 72 matching lines @@
             '<(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/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',
@@ skipping 16 matching lines @@
             '<(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/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 56 matching lines @@
                       # macdevicemanager.cc.
                       '-Wno-deprecated-declarations',
                     ],
                   },
                 }],
               ],
             }],
           ],
           'dependencies': [
             '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
+            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
+            'libjingle',
+          ],
+        },  # target libpeerconnection
+        {
+          'target_name': 'libpeerconnection',
+          'type': '<(libpeer_target_type)',
+          'sources': [
+            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
+            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
+          ],
+          'dependencies': [
             '<(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',
             '<@(libjingle_peerconnection_additional_deps)',
-            'libjingle',
+            'libjingle_webrtc',

[Mallinath (Gone from Chromium), 2013/03/25 13:52:37]

What about libjingle dependency on the left side?

[tommi (sloooow) - chröme, 2013/03/25 13:59:28]

If I'm understanding you correctly, then libjingle dependencies are pulled in
via libjingle_webrtc.

           ],
-        },  # target libpeerconnection
+          'export_dependent_settings': [
+            '<(DEPTH)/third_party/libjingle/libjingle.gyp:libjingle_webrtc',
+          ],
+          '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',
+                ],
+              },
+            }],
+          ],
+        },  # target peerconnection
       ],
     }],
   ],
 }