summaryrefslogtreecommitdiffstats
path: root/third_party/libjingle
diff options
context:
space:
mode:
authorperkj <perkj@chromium.org>2016-03-16 00:57:28 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-16 07:58:44 +0000
commit52eaa4e7cae9d553352f3331d1ccdc25cdffe449 (patch)
treede32786442f0a577153629e9d3c0cdb1418885c2 /third_party/libjingle
parentb07af059db98f2a718fa65d5d4914e0a4db116b5 (diff)
downloadchromium_src-52eaa4e7cae9d553352f3331d1ccdc25cdffe449.zip
chromium_src-52eaa4e7cae9d553352f3331d1ccdc25cdffe449.tar.gz
chromium_src-52eaa4e7cae9d553352f3331d1ccdc25cdffe449.tar.bz2
Update libjingle.gyp and BUILD.gn for WebRTC.
Files are being added and removed due to cleanup of the public Apis and removing PeerConnection dependencies on cricket::VideoCapturer. BUG=webrtc:5426 Review URL: https://codereview.chromium.org/1793433004 Cr-Commit-Position: refs/heads/master@{#381418}
Diffstat (limited to 'third_party/libjingle')
-rw-r--r--third_party/libjingle/BUILD.gn6
-rw-r--r--third_party/libjingle/libjingle.gyp6
2 files changed, 4 insertions, 8 deletions
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 962ec91..671a0bf 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -343,10 +343,6 @@ if (enable_webrtc) {
"../webrtc/api/webrtcsessiondescriptionfactory.cc",
"../webrtc/api/webrtcsessiondescriptionfactory.h",
"../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/cryptoparams.h",
@@ -378,6 +374,8 @@ if (enable_webrtc) {
"../webrtc/media/base/videoframe.h",
"../webrtc/media/base/videoframefactory.cc",
"../webrtc/media/base/videoframefactory.h",
+ "../webrtc/media/base/videosourcebase.cc",
+ "../webrtc/media/base/videosourcebase.h",
"../webrtc/media/engine/webrtccommon.h",
"../webrtc/media/engine/webrtcvideoframe.cc",
"../webrtc/media/engine/webrtcvideoframe.h",
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 586368c..3c3ecfb 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -308,10 +308,6 @@
'<(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',
- '<(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/cryptoparams.h',
@@ -343,6 +339,8 @@
'<(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/base/videosourcebase.cc',
+ '<(DEPTH)/third_party/webrtc/media/base/videosourcebase.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtccommon.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.h',