Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 1669023004: Roll WebRTC 11486:11495, Libjingle 11485:11495 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update includes in content and remoting Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 11ea9153de13d29f2df68b99a9b818516c17c0a1..cd3b85395dfa0436b7b4ca2e3a8942f9d77d6a9f 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',
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698