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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix 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 a079f015e2c4c536006732134b4ad0a47d16fe10..c2d73524ef86eb7d70791597f327540fb4d9884d 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -256,6 +256,78 @@
'target_name': 'libjingle_webrtc_common',
'type': 'static_library',
'sources': [
+ '<(DEPTH)/third_party/webrtc/api/audiotrack.cc',
+ '<(DEPTH)/third_party/webrtc/api/audiotrack.h',
+ '<(DEPTH)/third_party/webrtc/api/datachannel.cc',
+ '<(DEPTH)/third_party/webrtc/api/datachannel.h',
+ '<(DEPTH)/third_party/webrtc/api/dtlsidentitystore.cc',
+ '<(DEPTH)/third_party/webrtc/api/dtlsidentitystore.h',
+ '<(DEPTH)/third_party/webrtc/api/dtmfsender.cc',
+ '<(DEPTH)/third_party/webrtc/api/dtmfsender.h',
+ '<(DEPTH)/third_party/webrtc/api/jsep.h',
+ '<(DEPTH)/third_party/webrtc/api/jsepicecandidate.cc',
+ '<(DEPTH)/third_party/webrtc/api/jsepicecandidate.h',
+ '<(DEPTH)/third_party/webrtc/api/jsepsessiondescription.cc',
+ '<(DEPTH)/third_party/webrtc/api/jsepsessiondescription.h',
+ '<(DEPTH)/third_party/webrtc/api/localaudiosource.cc',
+ '<(DEPTH)/third_party/webrtc/api/localaudiosource.h',
+ '<(DEPTH)/third_party/webrtc/api/mediaconstraintsinterface.cc',
+ '<(DEPTH)/third_party/webrtc/api/mediaconstraintsinterface.h',
+ '<(DEPTH)/third_party/webrtc/api/mediacontroller.cc',
+ '<(DEPTH)/third_party/webrtc/api/mediacontroller.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastream.cc',
+ '<(DEPTH)/third_party/webrtc/api/mediastream.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamhandler.cc',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamhandler.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreaminterface.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamobserver.cc',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamobserver.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamprovider.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamproxy.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamtrack.h',
+ '<(DEPTH)/third_party/webrtc/api/mediastreamtrackproxy.h',
+ '<(DEPTH)/third_party/webrtc/api/notifier.h',
+ '<(DEPTH)/third_party/webrtc/api/peerconnection.cc',
+ '<(DEPTH)/third_party/webrtc/api/peerconnection.h',
+ '<(DEPTH)/third_party/webrtc/api/peerconnectionfactory.cc',
+ '<(DEPTH)/third_party/webrtc/api/peerconnectionfactory.h',
+ '<(DEPTH)/third_party/webrtc/api/peerconnectioninterface.h',
+ '<(DEPTH)/third_party/webrtc/api/portallocatorfactory.cc',
+ '<(DEPTH)/third_party/webrtc/api/portallocatorfactory.h',
+ '<(DEPTH)/third_party/webrtc/api/remoteaudiosource.cc',
+ '<(DEPTH)/third_party/webrtc/api/remoteaudiosource.h',
+ '<(DEPTH)/third_party/webrtc/api/remoteaudiotrack.cc',
+ '<(DEPTH)/third_party/webrtc/api/remoteaudiotrack.h',
+ '<(DEPTH)/third_party/webrtc/api/remotevideocapturer.cc',
+ '<(DEPTH)/third_party/webrtc/api/remotevideocapturer.h',
+ '<(DEPTH)/third_party/webrtc/api/rtpreceiver.cc',
+ '<(DEPTH)/third_party/webrtc/api/rtpreceiver.h',
+ '<(DEPTH)/third_party/webrtc/api/rtpreceiverinterface.h',
+ '<(DEPTH)/third_party/webrtc/api/rtpsender.cc',
+ '<(DEPTH)/third_party/webrtc/api/rtpsender.h',
+ '<(DEPTH)/third_party/webrtc/api/rtpsenderinterface.h',
+ '<(DEPTH)/third_party/webrtc/api/sctputils.cc',
+ '<(DEPTH)/third_party/webrtc/api/sctputils.h',
+ '<(DEPTH)/third_party/webrtc/api/statscollector.cc',
+ '<(DEPTH)/third_party/webrtc/api/statscollector.h',
+ '<(DEPTH)/third_party/webrtc/api/statstypes.cc',
+ '<(DEPTH)/third_party/webrtc/api/statstypes.h',
+ '<(DEPTH)/third_party/webrtc/api/streamcollection.h',
+ '<(DEPTH)/third_party/webrtc/api/umametrics.h',
+ '<(DEPTH)/third_party/webrtc/api/videosource.cc',
+ '<(DEPTH)/third_party/webrtc/api/videosource.h',
+ '<(DEPTH)/third_party/webrtc/api/videosourceinterface.h',
+ '<(DEPTH)/third_party/webrtc/api/videosourceproxy.h',
+ '<(DEPTH)/third_party/webrtc/api/videotrack.cc',
+ '<(DEPTH)/third_party/webrtc/api/videotrack.h',
+ '<(DEPTH)/third_party/webrtc/api/videotrackrenderers.cc',
+ '<(DEPTH)/third_party/webrtc/api/videotrackrenderers.h',
+ '<(DEPTH)/third_party/webrtc/api/webrtcsdp.cc',
+ '<(DEPTH)/third_party/webrtc/api/webrtcsdp.h',
+ '<(DEPTH)/third_party/webrtc/api/webrtcsession.cc',
+ '<(DEPTH)/third_party/webrtc/api/webrtcsession.h',
+ '<(DEPTH)/third_party/webrtc/api/webrtcsessiondescriptionfactory.cc',
+ '<(DEPTH)/third_party/webrtc/api/webrtcsessiondescriptionfactory.h',
'<(DEPTH)/third_party/webrtc/media/base/audiorenderer.h',
'<(DEPTH)/third_party/webrtc/media/base/capturemanager.cc',
'<(DEPTH)/third_party/webrtc/media/base/capturemanager.h',
@@ -298,78 +370,6 @@
'<(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',
- '<(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/mediaconstraintsinterface.cc',
- '<(libjingle_source)/talk/app/webrtc/mediaconstraintsinterface.h',
- '<(libjingle_source)/talk/app/webrtc/mediacontroller.cc',
- '<(libjingle_source)/talk/app/webrtc/mediacontroller.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/mediastreamobserver.cc',
- '<(libjingle_source)/talk/app/webrtc/mediastreamobserver.h',
- '<(libjingle_source)/talk/app/webrtc/mediastreamprovider.h',
- '<(libjingle_source)/talk/app/webrtc/mediastreamproxy.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/remoteaudiosource.cc',
- '<(libjingle_source)/talk/app/webrtc/remoteaudiosource.h',
- '<(libjingle_source)/talk/app/webrtc/remoteaudiotrack.cc',
- '<(libjingle_source)/talk/app/webrtc/remoteaudiotrack.h',
- '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.cc',
- '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.h',
- '<(libjingle_source)/talk/app/webrtc/rtpreceiver.cc',
- '<(libjingle_source)/talk/app/webrtc/rtpreceiver.h',
- '<(libjingle_source)/talk/app/webrtc/rtpreceiverinterface.h',
- '<(libjingle_source)/talk/app/webrtc/rtpsender.cc',
- '<(libjingle_source)/talk/app/webrtc/rtpsender.h',
- '<(libjingle_source)/talk/app/webrtc/rtpsenderinterface.h',
- '<(libjingle_source)/talk/app/webrtc/sctputils.cc',
- '<(libjingle_source)/talk/app/webrtc/sctputils.h',
- '<(libjingle_source)/talk/app/webrtc/statscollector.cc',
- '<(libjingle_source)/talk/app/webrtc/statscollector.h',
- '<(libjingle_source)/talk/app/webrtc/statstypes.cc',
- '<(libjingle_source)/talk/app/webrtc/statstypes.h',
- '<(libjingle_source)/talk/app/webrtc/streamcollection.h',
- '<(libjingle_source)/talk/app/webrtc/umametrics.h',
- '<(libjingle_source)/talk/app/webrtc/videosource.cc',
- '<(libjingle_source)/talk/app/webrtc/videosource.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/app/webrtc/webrtcsessiondescriptionfactory.cc',
- '<(libjingle_source)/talk/app/webrtc/webrtcsessiondescriptionfactory.h',
'<(libjingle_source)/talk/session/media/audiomonitor.cc',
'<(libjingle_source)/talk/session/media/audiomonitor.h',
'<(libjingle_source)/talk/session/media/bundlefilter.cc',
« 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