Refactor libjingle and libpeerconnection targets.

third_party/libjingle/libjingle.gyp

Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 7185fec94794411a4bcad3c24a2dff5d7513bc6e..b87bc7c0e6f7d8dcf7a98ba9289cf3413945fc99 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -8,6 +8,7 @@
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
+    'libjingle_additional_deps%': [],
     'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
     'libpeer_target_type%': 'static_library',
@@ -242,6 +243,54 @@
         'overrides/talk/base/logging.cc',
         'overrides/talk/base/logging.h',
 
+        '<(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',
+        '<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.cc',
+        '<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.h',
+        '<(libjingle_source)/talk/app/webrtc/localaudiosource.cc',
+        '<(libjingle_source)/talk/app/webrtc/localaudiosource.h',
+        '<(libjingle_source)/talk/app/webrtc/localvideosource.cc',
+        '<(libjingle_source)/talk/app/webrtc/localvideosource.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastream.cc',
+        '<(libjingle_source)/talk/app/webrtc/mediastream.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamhandler.cc',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamhandler.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastreaminterface.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamprovider.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamproxy.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.cc',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.h',
+        '<(libjingle_source)/talk/app/webrtc/mediastreamtrack.h',
+        '<(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/statstypes.h',
+        '<(libjingle_source)/talk/app/webrtc/streamcollection.h',
+        '<(libjingle_source)/talk/app/webrtc/videosourceinterface.h',
+        '<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
+        '<(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/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/base/asyncfile.cc',
         '<(libjingle_source)/talk/base/asyncfile.h',
         '<(libjingle_source)/talk/base/asynchttprequest.cc',
@@ -383,6 +432,44 @@
         '<(libjingle_source)/talk/base/urlencode.h',
         '<(libjingle_source)/talk/base/worker.cc',
         '<(libjingle_source)/talk/base/worker.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',
+        '<(libjingle_source)/talk/media/base/cryptoparams.h',
+        '<(libjingle_source)/talk/media/base/filemediaengine.cc',
+        '<(libjingle_source)/talk/media/base/filemediaengine.h',
+        '<(libjingle_source)/talk/media/base/mediachannel.h',
+        '<(libjingle_source)/talk/media/base/mediaengine.cc',
+        '<(libjingle_source)/talk/media/base/mediaengine.h',
+        '<(libjingle_source)/talk/media/base/rtpdataengine.cc',
+        '<(libjingle_source)/talk/media/base/rtpdataengine.h',
+        '<(libjingle_source)/talk/media/base/rtpdump.cc',
+        '<(libjingle_source)/talk/media/base/rtpdump.h',
+        '<(libjingle_source)/talk/media/base/rtputils.cc',
+        '<(libjingle_source)/talk/media/base/rtputils.h',
+        '<(libjingle_source)/talk/media/base/streamparams.cc',
+        '<(libjingle_source)/talk/media/base/streamparams.h',
+        '<(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/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/p2p/base/candidate.h',
         '<(libjingle_source)/talk/p2p/base/common.h',
         '<(libjingle_source)/talk/p2p/base/dtlstransport.h',
@@ -447,6 +534,40 @@
         '<(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/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/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',
         '<(libjingle_source)/talk/xmllite/qname.cc',
         '<(libjingle_source)/talk/xmllite/qname.h',
         '<(libjingle_source)/talk/xmllite/xmlbuilder.cc',
@@ -489,6 +610,11 @@
       ],
       'dependencies': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+        '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
+        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',

[Ronghua Wu (Left Chromium), 2013/03/18 18:36:30]

Do we need the conditions 'enable_webrtc==1' since the webrtc modules are used.

[tommi (sloooow) - chröme, 2013/03/18 20:14:21]

Yes, thanks for catching that.  I've fixed it and improved the diff.

+        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
+        '<@(libjingle_additional_deps)',
+        'libjingle_media_base_constants',
         'libjingle_p2p_constants',
       ],
       'export_dependent_settings': [
@@ -564,6 +690,79 @@
             '<(libjingle_source)/talk/base/opensslstreamadapter.cc',
           ],
         }],
+        ['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',
+            '<(libjingle_source)/talk/sound/nullsoundsystemfactory.cc',
+            '<(libjingle_source)/talk/sound/nullsoundsystemfactory.h',
+            '<(libjingle_source)/talk/sound/platformsoundsystem.cc',
+            '<(libjingle_source)/talk/sound/platformsoundsystem.h',
+            '<(libjingle_source)/talk/sound/platformsoundsystemfactory.cc',
+            '<(libjingle_source)/talk/sound/platformsoundsystemfactory.h',
+            '<(libjingle_source)/talk/sound/soundsysteminterface.cc',
+            '<(libjingle_source)/talk/sound/soundsysteminterface.h',
+            '<(libjingle_source)/talk/sound/soundsystemproxy.cc',
+            '<(libjingle_source)/talk/sound/soundsystemproxy.h',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              'sources': [
+                '<(libjingle_source)/talk/base/win32window.cc',
+                '<(libjingle_source)/talk/base/win32window.h',
+                '<(libjingle_source)/talk/base/win32windowpicker.cc',
+                '<(libjingle_source)/talk/base/win32windowpicker.h',
+                '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc',
+                '<(libjingle_source)/talk/media/devices/win32devicemanager.cc',
+                '<(libjingle_source)/talk/media/devices/win32devicemanager.h',
+              ],
+            }],
+            ['OS=="linux"', {
+              'sources': [
+                '<(libjingle_source)/talk/base/linuxwindowpicker.cc',
+                '<(libjingle_source)/talk/base/linuxwindowpicker.h',
+                '<(libjingle_source)/talk/media/devices/libudevsymboltable.cc',
+                '<(libjingle_source)/talk/media/devices/libudevsymboltable.h',
+                '<(libjingle_source)/talk/media/devices/linuxdeviceinfo.cc',
+                '<(libjingle_source)/talk/media/devices/linuxdevicemanager.cc',
+                '<(libjingle_source)/talk/media/devices/linuxdevicemanager.h',
+                '<(libjingle_source)/talk/media/devices/v4llookup.cc',
+                '<(libjingle_source)/talk/media/devices/v4llookup.h',
+                '<(libjingle_source)/talk/sound/alsasoundsystem.cc',
+                '<(libjingle_source)/talk/sound/alsasoundsystem.h',
+                '<(libjingle_source)/talk/sound/alsasymboltable.cc',
+                '<(libjingle_source)/talk/sound/alsasymboltable.h',
+                '<(libjingle_source)/talk/sound/linuxsoundsystem.cc',
+                '<(libjingle_source)/talk/sound/linuxsoundsystem.h',
+                '<(libjingle_source)/talk/sound/pulseaudiosoundsystem.cc',
+                '<(libjingle_source)/talk/sound/pulseaudiosoundsystem.h',
+                '<(libjingle_source)/talk/sound/pulseaudiosymboltable.cc',
+                '<(libjingle_source)/talk/sound/pulseaudiosymboltable.h',
+              ],
+            }],
+            ['OS=="mac"', {
+              'sources': [
+                '<(libjingle_source)/talk/media/devices/macdeviceinfo.cc',
+                '<(libjingle_source)/talk/media/devices/macdevicemanager.cc',
+                '<(libjingle_source)/talk/media/devices/macdevicemanager.h',
+                '<(libjingle_source)/talk/media/devices/macdevicemanagermm.mm',
+              ],
+              'xcode_settings': {
+                'WARNING_CFLAGS': [
+                  # Suppres warnings about using deprecated functions in
+                  # macdevicemanager.cc.
+                  '-Wno-deprecated-declarations',
+                ],
+              },
+            }],
+          ],
+        }],
       ],
     },  # target libjingle
     # This has to be is a separate project due to a bug in MSVS 2008 and the
@@ -582,6 +781,14 @@
       ],
     },  # target libjingle_p2p_constants
     {
+      'target_name': 'libjingle_media_base_constants',
+      'type': 'static_library',
+      'sources': [
+        '<(libjingle_source)/talk/media/base/constants.cc',
+        '<(libjingle_source)/talk/media/base/constants.h',
+      ],
+    },  # target libjingle_media_base_constants
+    {
       'target_name': 'peerconnection_server',
       'type': 'executable',
       'sources': [
@@ -617,132 +824,10 @@
             ],
           },
           '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',
-            '<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.cc',
-            '<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.h',
-            '<(libjingle_source)/talk/app/webrtc/localaudiosource.cc',
-            '<(libjingle_source)/talk/app/webrtc/localaudiosource.h',
-            '<(libjingle_source)/talk/app/webrtc/localvideosource.cc',
-            '<(libjingle_source)/talk/app/webrtc/localvideosource.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastream.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediastream.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamhandler.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamhandler.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreaminterface.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamprovider.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamproxy.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamsignaling.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamtrack.h',
-            '<(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/statstypes.h',
-            '<(libjingle_source)/talk/app/webrtc/streamcollection.h',
-            '<(libjingle_source)/talk/app/webrtc/videosourceinterface.h',
-            '<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
-            '<(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/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',
-            '<(libjingle_source)/talk/media/base/constants.cc',
-            '<(libjingle_source)/talk/media/base/constants.h',
-            '<(libjingle_source)/talk/media/base/cryptoparams.h',
-            '<(libjingle_source)/talk/media/base/filemediaengine.cc',
-            '<(libjingle_source)/talk/media/base/filemediaengine.h',
-            '<(libjingle_source)/talk/media/base/mediachannel.h',
-            '<(libjingle_source)/talk/media/base/mediaengine.cc',
-            '<(libjingle_source)/talk/media/base/mediaengine.h',
-            '<(libjingle_source)/talk/media/base/rtpdataengine.cc',
-            '<(libjingle_source)/talk/media/base/rtpdataengine.h',
-            '<(libjingle_source)/talk/media/base/rtpdump.cc',
-            '<(libjingle_source)/talk/media/base/rtpdump.h',
-            '<(libjingle_source)/talk/media/base/rtputils.cc',
-            '<(libjingle_source)/talk/media/base/rtputils.h',
-            '<(libjingle_source)/talk/media/base/streamparams.cc',
-            '<(libjingle_source)/talk/media/base/streamparams.h',
-            '<(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/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/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"', {
@@ -758,83 +843,8 @@
                 ],
               },
             }],
-            ['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',
-                '<(libjingle_source)/talk/sound/nullsoundsystemfactory.cc',
-                '<(libjingle_source)/talk/sound/nullsoundsystemfactory.h',
-                '<(libjingle_source)/talk/sound/platformsoundsystem.cc',
-                '<(libjingle_source)/talk/sound/platformsoundsystem.h',
-                '<(libjingle_source)/talk/sound/platformsoundsystemfactory.cc',
-                '<(libjingle_source)/talk/sound/platformsoundsystemfactory.h',
-                '<(libjingle_source)/talk/sound/soundsysteminterface.cc',
-                '<(libjingle_source)/talk/sound/soundsysteminterface.h',
-                '<(libjingle_source)/talk/sound/soundsystemproxy.cc',
-                '<(libjingle_source)/talk/sound/soundsystemproxy.h',
-              ],
-              'conditions': [
-                ['OS=="win"', {
-                  'sources': [
-                    '<(libjingle_source)/talk/base/win32window.cc',
-                    '<(libjingle_source)/talk/base/win32window.h',
-                    '<(libjingle_source)/talk/base/win32windowpicker.cc',
-                    '<(libjingle_source)/talk/base/win32windowpicker.h',
-                    '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc',
-                    '<(libjingle_source)/talk/media/devices/win32devicemanager.cc',
-                    '<(libjingle_source)/talk/media/devices/win32devicemanager.h',
-                  ],
-                }],
-                ['OS=="linux"', {
-                  'sources': [
-                    '<(libjingle_source)/talk/base/linuxwindowpicker.cc',
-                    '<(libjingle_source)/talk/base/linuxwindowpicker.h',
-                    '<(libjingle_source)/talk/media/devices/libudevsymboltable.cc',
-                    '<(libjingle_source)/talk/media/devices/libudevsymboltable.h',
-                    '<(libjingle_source)/talk/media/devices/linuxdeviceinfo.cc',
-                    '<(libjingle_source)/talk/media/devices/linuxdevicemanager.cc',
-                    '<(libjingle_source)/talk/media/devices/linuxdevicemanager.h',
-                    '<(libjingle_source)/talk/media/devices/v4llookup.cc',
-                    '<(libjingle_source)/talk/media/devices/v4llookup.h',
-                    '<(libjingle_source)/talk/sound/alsasoundsystem.cc',
-                    '<(libjingle_source)/talk/sound/alsasoundsystem.h',
-                    '<(libjingle_source)/talk/sound/alsasymboltable.cc',
-                    '<(libjingle_source)/talk/sound/alsasymboltable.h',
-                    '<(libjingle_source)/talk/sound/linuxsoundsystem.cc',
-                    '<(libjingle_source)/talk/sound/linuxsoundsystem.h',
-                    '<(libjingle_source)/talk/sound/pulseaudiosoundsystem.cc',
-                    '<(libjingle_source)/talk/sound/pulseaudiosoundsystem.h',
-                    '<(libjingle_source)/talk/sound/pulseaudiosymboltable.cc',
-                    '<(libjingle_source)/talk/sound/pulseaudiosymboltable.h',
-                  ],
-                }],
-                ['OS=="mac"', {
-                  'sources': [
-                    '<(libjingle_source)/talk/media/devices/macdeviceinfo.cc',
-                    '<(libjingle_source)/talk/media/devices/macdevicemanager.cc',
-                    '<(libjingle_source)/talk/media/devices/macdevicemanager.h',
-                    '<(libjingle_source)/talk/media/devices/macdevicemanagermm.mm',
-                  ],
-                  'xcode_settings': {
-                    'WARNING_CFLAGS': [
-                      # Suppres warnings about using deprecated functions in
-                      # macdevicemanager.cc.
-                      '-Wno-deprecated-declarations',
-                    ],
-                  },
-                }],
-              ],
-            }],
           ],
           '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',