diff options
Diffstat (limited to 'third_party/libjingle')
-rw-r--r-- | third_party/libjingle/BUILD.gn | 108 | ||||
-rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
-rw-r--r-- | third_party/libjingle/libjingle.gyp | 144 |
3 files changed, 127 insertions, 127 deletions
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 3843e44c..33f44ed 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -296,6 +296,50 @@ if (enable_webrtc) { # as is supported in the GYP build. It's not clear what this is used for. source_set("libjingle_webrtc_common") { sources = [ + "../webrtc/media/base/audiorenderer.h", + "../webrtc/media/base/capturemanager.cc", + "../webrtc/media/base/capturemanager.h", + "../webrtc/media/base/capturerenderadapter.cc", + "../webrtc/media/base/capturerenderadapter.h", + "../webrtc/media/base/codec.cc", + "../webrtc/media/base/codec.h", + "../webrtc/media/base/constants.cc", + "../webrtc/media/base/constants.h", + "../webrtc/media/base/cryptoparams.h", + "../webrtc/media/base/hybriddataengine.h", + "../webrtc/media/base/mediachannel.h", + "../webrtc/media/base/mediaengine.cc", + "../webrtc/media/base/mediaengine.h", + "../webrtc/media/base/rtpdataengine.cc", + "../webrtc/media/base/rtpdataengine.h", + "../webrtc/media/base/rtpdump.cc", + "../webrtc/media/base/rtpdump.h", + "../webrtc/media/base/rtputils.cc", + "../webrtc/media/base/rtputils.h", + "../webrtc/media/base/streamparams.cc", + "../webrtc/media/base/streamparams.h", + "../webrtc/media/base/turnutils.cc", + "../webrtc/media/base/turnutils.h", + "../webrtc/media/base/videoadapter.cc", + "../webrtc/media/base/videoadapter.h", + "../webrtc/media/base/videocapturer.cc", + "../webrtc/media/base/videocapturer.h", + "../webrtc/media/base/videocommon.cc", + "../webrtc/media/base/videocommon.h", + "../webrtc/media/base/videoframe.cc", + "../webrtc/media/base/videoframe.h", + "../webrtc/media/base/videoframefactory.cc", + "../webrtc/media/base/videoframefactory.h", + "../webrtc/media/devices/dummydevicemanager.cc", + "../webrtc/media/devices/dummydevicemanager.h", + "../webrtc/media/devices/filevideocapturer.cc", + "../webrtc/media/devices/filevideocapturer.h", + "../webrtc/media/webrtc/webrtccommon.h", + "../webrtc/media/webrtc/webrtcvideoframe.cc", + "../webrtc/media/webrtc/webrtcvideoframe.h", + "../webrtc/media/webrtc/webrtcvideoframefactory.cc", + "../webrtc/media/webrtc/webrtcvideoframefactory.h", + "../webrtc/media/webrtc/webrtcvoe.h", "source/talk/app/webrtc/audiotrack.cc", "source/talk/app/webrtc/audiotrack.h", "source/talk/app/webrtc/datachannel.cc", @@ -368,50 +412,6 @@ if (enable_webrtc) { "source/talk/app/webrtc/webrtcsession.h", "source/talk/app/webrtc/webrtcsessiondescriptionfactory.cc", "source/talk/app/webrtc/webrtcsessiondescriptionfactory.h", - "source/talk/media/base/audiorenderer.h", - "source/talk/media/base/capturemanager.cc", - "source/talk/media/base/capturemanager.h", - "source/talk/media/base/capturerenderadapter.cc", - "source/talk/media/base/capturerenderadapter.h", - "source/talk/media/base/codec.cc", - "source/talk/media/base/codec.h", - "source/talk/media/base/constants.cc", - "source/talk/media/base/constants.h", - "source/talk/media/base/cryptoparams.h", - "source/talk/media/base/hybriddataengine.h", - "source/talk/media/base/mediachannel.h", - "source/talk/media/base/mediaengine.cc", - "source/talk/media/base/mediaengine.h", - "source/talk/media/base/rtpdataengine.cc", - "source/talk/media/base/rtpdataengine.h", - "source/talk/media/base/rtpdump.cc", - "source/talk/media/base/rtpdump.h", - "source/talk/media/base/rtputils.cc", - "source/talk/media/base/rtputils.h", - "source/talk/media/base/streamparams.cc", - "source/talk/media/base/streamparams.h", - "source/talk/media/base/turnutils.cc", - "source/talk/media/base/turnutils.h", - "source/talk/media/base/videoadapter.cc", - "source/talk/media/base/videoadapter.h", - "source/talk/media/base/videocapturer.cc", - "source/talk/media/base/videocapturer.h", - "source/talk/media/base/videocommon.cc", - "source/talk/media/base/videocommon.h", - "source/talk/media/base/videoframe.cc", - "source/talk/media/base/videoframe.h", - "source/talk/media/base/videoframefactory.cc", - "source/talk/media/base/videoframefactory.h", - "source/talk/media/devices/dummydevicemanager.cc", - "source/talk/media/devices/dummydevicemanager.h", - "source/talk/media/devices/filevideocapturer.cc", - "source/talk/media/devices/filevideocapturer.h", - "source/talk/media/webrtc/webrtccommon.h", - "source/talk/media/webrtc/webrtcvideoframe.cc", - "source/talk/media/webrtc/webrtcvideoframe.h", - "source/talk/media/webrtc/webrtcvideoframefactory.cc", - "source/talk/media/webrtc/webrtcvideoframefactory.h", - "source/talk/media/webrtc/webrtcvoe.h", "source/talk/session/media/audiomonitor.cc", "source/talk/session/media/audiomonitor.h", "source/talk/session/media/bundlefilter.cc", @@ -453,8 +453,8 @@ if (enable_webrtc) { if (!is_ios) { # TODO(mallinath) - Enable SCTP for iOS. sources += [ - "source/talk/media/sctp/sctpdataengine.cc", - "source/talk/media/sctp/sctpdataengine.h", + "../webrtc/media/sctp/sctpdataengine.cc", + "../webrtc/media/sctp/sctpdataengine.h", ] defines = [ "HAVE_SCTP" ] deps += [ "//third_party/usrsctp" ] @@ -465,14 +465,14 @@ if (enable_webrtc) { # as is supported in the GYP build. It's not clear what this is used for. source_set("libpeerconnection") { sources = [ - "source/talk/media/webrtc/simulcast.cc", - "source/talk/media/webrtc/simulcast.h", - "source/talk/media/webrtc/webrtcmediaengine.cc", - "source/talk/media/webrtc/webrtcmediaengine.h", - "source/talk/media/webrtc/webrtcvideoengine2.cc", - "source/talk/media/webrtc/webrtcvideoengine2.h", - "source/talk/media/webrtc/webrtcvoiceengine.cc", - "source/talk/media/webrtc/webrtcvoiceengine.h", + "../webrtc/media/webrtc/simulcast.cc", + "../webrtc/media/webrtc/simulcast.h", + "../webrtc/media/webrtc/webrtcmediaengine.cc", + "../webrtc/media/webrtc/webrtcmediaengine.h", + "../webrtc/media/webrtc/webrtcvideoengine2.cc", + "../webrtc/media/webrtc/webrtcvideoengine2.h", + "../webrtc/media/webrtc/webrtcvoiceengine.cc", + "../webrtc/media/webrtc/webrtcvoiceengine.h", ] configs += [ ":jingle_unexported_configs" ] diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 0f2bc27..0ed4365 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://www.webrtc.org Version: unknown -Revision: 11485 +Revision: 11495 License: BSD License File: source/talk/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 11ea915..cd3b853 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -256,6 +256,50 @@ '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', @@ -328,50 +372,6 @@ '<(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', @@ -402,8 +402,8 @@ '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', @@ -411,38 +411,38 @@ }], ['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': [ @@ -482,14 +482,14 @@ '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', |