Roll WebRTC 11486:11495, Libjingle 11485:11495

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,
@@ skipping 238 matching lines @@
     },  # target libjingle_p2p_constants
   ],
   'conditions': [
     ['enable_webrtc==1', {
       'targets': [
         {
           # GN version: //third_party/libjingle:libjingle_webrtc_common
           'target_name': 'libjingle_webrtc_common',
           'type': 'static_library',
           'sources': [
+            '<(DEPTH)/third_party/webrtc/media/base/audiorenderer.h',
+            '<(DEPTH)/third_party/webrtc/media/base/capturemanager.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/capturemanager.h',
+            '<(DEPTH)/third_party/webrtc/media/base/capturerenderadapter.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/capturerenderadapter.h',
+            '<(DEPTH)/third_party/webrtc/media/base/codec.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/codec.h',
+            '<(DEPTH)/third_party/webrtc/media/base/constants.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/constants.h',
+            '<(DEPTH)/third_party/webrtc/media/base/cryptoparams.h',
+            '<(DEPTH)/third_party/webrtc/media/base/hybriddataengine.h',
+            '<(DEPTH)/third_party/webrtc/media/base/mediachannel.h',
+            '<(DEPTH)/third_party/webrtc/media/base/mediaengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/mediaengine.h',
+            '<(DEPTH)/third_party/webrtc/media/base/rtpdataengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/rtpdataengine.h',
+            '<(DEPTH)/third_party/webrtc/media/base/rtpdump.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/rtpdump.h',
+            '<(DEPTH)/third_party/webrtc/media/base/rtputils.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/rtputils.h',
+            '<(DEPTH)/third_party/webrtc/media/base/streamparams.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/streamparams.h',
+            '<(DEPTH)/third_party/webrtc/media/base/turnutils.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/turnutils.h',
+            '<(DEPTH)/third_party/webrtc/media/base/videoadapter.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/videoadapter.h',
+            '<(DEPTH)/third_party/webrtc/media/base/videocapturer.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/videocapturer.h',
+            '<(DEPTH)/third_party/webrtc/media/base/videocommon.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/videocommon.h',
+            '<(DEPTH)/third_party/webrtc/media/base/videoframe.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/videoframe.h',
+            '<(DEPTH)/third_party/webrtc/media/base/videoframefactory.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/videoframefactory.h',
+            '<(DEPTH)/third_party/webrtc/media/devices/dummydevicemanager.cc',
+            '<(DEPTH)/third_party/webrtc/media/devices/dummydevicemanager.h',
+            '<(DEPTH)/third_party/webrtc/media/devices/filevideocapturer.cc',
+            '<(DEPTH)/third_party/webrtc/media/devices/filevideocapturer.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtccommon.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframe.cc',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframe.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframefactory.cc',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframefactory.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvoe.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/dtlsidentitystore.cc',
             '<(libjingle_source)/talk/app/webrtc/dtlsidentitystore.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',
@@ skipping 52 matching lines @@
             '<(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/app/webrtc/webrtcsessiondescriptionfactory.cc',
             '<(libjingle_source)/talk/app/webrtc/webrtcsessiondescriptionfactory.h',
-            '<(libjingle_source)/talk/media/base/audiorenderer.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/hybriddataengine.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/turnutils.cc',
-            '<(libjingle_source)/talk/media/base/turnutils.h',
-            '<(libjingle_source)/talk/media/base/videoadapter.cc',
-            '<(libjingle_source)/talk/media/base/videoadapter.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/base/videoframefactory.cc',
-            '<(libjingle_source)/talk/media/base/videoframefactory.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/webrtcvideoframe.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoframe.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoe.h',
             '<(libjingle_source)/talk/session/media/audiomonitor.cc',
             '<(libjingle_source)/talk/session/media/audiomonitor.h',
             '<(libjingle_source)/talk/session/media/bundlefilter.cc',
             '<(libjingle_source)/talk/session/media/bundlefilter.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 10 matching lines @@
             '<(libjingle_source)/talk/session/media/srtpfilter.h',
             '<(libjingle_source)/talk/session/media/voicechannel.h',
           ],
           'conditions': [
             # TODO(mallinath) - Enable SCTP for iOS.
             ['OS!="ios"', {
               'defines': [
                 'HAVE_SCTP',
               ],
               'sources': [
-                '<(libjingle_source)/talk/media/sctp/sctpdataengine.cc',
-                '<(libjingle_source)/talk/media/sctp/sctpdataengine.h',
+                '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.cc',
+                '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.h',
               ],
               'dependencies': [
                 '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
               ],
             }],
             ['enabled_libjingle_device_manager==1', {
               'sources!': [
-                '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
-                '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
+                '<(DEPTH)/third_party/webrtc/media/devices/dummydevicemanager.cc',
+                '<(DEPTH)/third_party/webrtc/media/devices/dummydevicemanager.h',
               ],
               'sources': [
-                '<(libjingle_source)/talk/media/devices/devicemanager.cc',
-                '<(libjingle_source)/talk/media/devices/devicemanager.h',
+                '<(DEPTH)/third_party/webrtc/media/devices/devicemanager.cc',
+                '<(DEPTH)/third_party/webrtc/media/devices/devicemanager.h',
               ],
               'conditions': [
                 ['OS=="win"', {
                   'sources': [
-                    '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc',
-                    '<(libjingle_source)/talk/media/devices/win32devicemanager.cc',
-                    '<(libjingle_source)/talk/media/devices/win32devicemanager.h',
+                    '<(DEPTH)/third_party/webrtc/media/devices/win32deviceinfo.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/win32devicemanager.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/win32devicemanager.h',
                   ],
                 }],
                 ['OS=="linux"', {
                   'sources': [
-                    '<(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',
+                    '<(DEPTH)/third_party/webrtc/media/devices/libudevsymboltable.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/libudevsymboltable.h',
+                    '<(DEPTH)/third_party/webrtc/media/devices/linuxdeviceinfo.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/linuxdevicemanager.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/linuxdevicemanager.h',
+                    '<(DEPTH)/third_party/webrtc/media/devices/v4llookup.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/v4llookup.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',
+                    '<(DEPTH)/third_party/webrtc/media/devices/macdeviceinfo.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/macdevicemanager.cc',
+                    '<(DEPTH)/third_party/webrtc/media/devices/macdevicemanager.h',
+                    '<(DEPTH)/third_party/webrtc/media/devices/macdevicemanagermm.mm',
                   ],
                   'xcode_settings': {
                     'WARNING_CFLAGS': [
                       # Suppres warnings about using deprecated functions in
                       # macdevicemanager.cc.
                       '-Wno-deprecated-declarations',
                     ],
                   },
                 }],
               ],
@@ skipping 19 matching lines @@
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',
             'libjingle_webrtc_common',
           ],
         },
         {
           # GN version: //third_party/libjingle:libpeerconnection
           'target_name': 'libpeerconnection',
           'type': 'static_library',
           'sources': [
             # Note: sources list duplicated in GN build.
-            '<(libjingle_source)/talk/media/webrtc/simulcast.cc',
-            '<(libjingle_source)/talk/media/webrtc/simulcast.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/simulcast.cc',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/simulcast.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcmediaengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcmediaengine.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoengine2.cc',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoengine2.h',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvoiceengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvoiceengine.h',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
             '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
             '<@(libjingle_peerconnection_additional_deps)',
             'libjingle_webrtc_common',
           ],
           'conditions': [
             ['OS=="android"', {
               'standalone_static_library': 1,
             }],
           ],
         },  # target libpeerconnection
       ],
     }],
   ],
 }