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

Unified Diff: third_party/libjingle/BUILD.gn

Issue 1839063005: Reland of move libpeerconnection target from third_party/libjingle (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « remoting/remoting.gyp ('k') | third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/BUILD.gn
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 3f5659bf19b030bd3ed831ad700133708d38c11d..d211bbab80691d2ed4b644d2874f37ec9a017a78 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -369,12 +369,20 @@
"../webrtc/media/base/videoframefactory.h",
"../webrtc/media/base/videosourcebase.cc",
"../webrtc/media/base/videosourcebase.h",
+ "../webrtc/media/engine/simulcast.cc",
+ "../webrtc/media/engine/simulcast.h",
"../webrtc/media/engine/webrtccommon.h",
+ "../webrtc/media/engine/webrtcmediaengine.cc",
+ "../webrtc/media/engine/webrtcmediaengine.h",
+ "../webrtc/media/engine/webrtcvideoengine2.cc",
+ "../webrtc/media/engine/webrtcvideoengine2.h",
"../webrtc/media/engine/webrtcvideoframe.cc",
"../webrtc/media/engine/webrtcvideoframe.h",
"../webrtc/media/engine/webrtcvideoframefactory.cc",
"../webrtc/media/engine/webrtcvideoframefactory.h",
"../webrtc/media/engine/webrtcvoe.h",
+ "../webrtc/media/engine/webrtcvoiceengine.cc",
+ "../webrtc/media/engine/webrtcvoiceengine.h",
"../webrtc/pc/audiomonitor.cc",
"../webrtc/pc/audiomonitor.h",
"../webrtc/pc/bundlefilter.cc",
@@ -408,9 +416,12 @@
deps = [
":libjingle",
"//third_party/libsrtp",
+ "//third_party/webrtc",
"//third_party/webrtc/modules/media_file",
"//third_party/webrtc/modules/video_capture",
"//third_party/webrtc/modules/video_render",
+ "//third_party/webrtc/system_wrappers",
+ "//third_party/webrtc/voice_engine",
]
if (!is_ios) {
@@ -424,33 +435,6 @@
}
}
- source_set("libpeerconnection") {
- sources = [
- "../webrtc/media/engine/simulcast.cc",
- "../webrtc/media/engine/simulcast.h",
- "../webrtc/media/engine/webrtcmediaengine.cc",
- "../webrtc/media/engine/webrtcmediaengine.h",
- "../webrtc/media/engine/webrtcvideoengine2.cc",
- "../webrtc/media/engine/webrtcvideoengine2.h",
- "../webrtc/media/engine/webrtcvoiceengine.cc",
- "../webrtc/media/engine/webrtcvoiceengine.h",
- ]
-
- configs += [ ":jingle_unexported_configs" ]
- public_configs = [ ":jingle_public_configs" ]
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
-
- deps = [
- # TODO(GYP): crbug.com/481633. Consider depending on :libjingle_webrtc
- # instead.
- ":libjingle_webrtc_common",
- "//third_party/webrtc",
- "//third_party/webrtc/system_wrappers",
- "//third_party/webrtc/voice_engine",
- ]
- }
-
source_set("libstunprober") {
p2p_dir = "../webrtc/p2p"
sources = [
« no previous file with comments | « remoting/remoting.gyp ('k') | third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698