Skip to content

GitLab

T
tangled
Commit d0e9a076 authored by kjellander's avatar kjellander Committed by Commit bot
Browse files
Options

Migrate libjingle to WebRTC build targets. 

This is a large improvement from the previous duplicated lists of
source files in WebRTC. This moves over to using the GYP/GN targets
in third_party/webrtc instead, which has become possible after landing
https://codereview.webrtc.org/1924663003/ and
https://codereview.webrtc.org/2037983002/.

BUG=webrtc:4256
TESTED=Local builds passing for Linux and Android.

Review-Url: https://codereview.chromium.org/2022833002
Cr-Commit-Position: refs/heads/master@{#408931}
parent 6bc53f0e
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 674 deletions
content/browser/BUILD.gn
View file @ d0e9a076
......@@ -191,6 +191,7 @@ source_set("browser") {
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/modules/desktop_capture:primitives",
]
if (is_linux || is_mac || is_win) {
......
content/renderer/BUILD.gn
View file @ d0e9a076
......@@ -172,13 +172,17 @@ target(link_target_type, "renderer") {
deps += [
"//crypto",
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libstunprober",
"//third_party/libvpx",
"//third_party/webrtc/api:libjingle_peerconnection",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/common_video",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/modules/audio_device",
"//third_party/webrtc/modules/audio_processing",
"//third_party/webrtc/modules/video_coding:webrtc_h264",
"//third_party/webrtc/p2p:libstunprober",
"//third_party/webrtc/p2p:rtc_p2p",
"//third_party/webrtc/pc:rtc_pc",
"//third_party/webrtc/system_wrappers",
]
if (rtc_use_h264) {
......
content/test/BUILD.gn
View file @ d0e9a076
......@@ -149,7 +149,9 @@ static_library("test_support") {
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/api:libjingle_peerconnection",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/modules/video_capture",
]
}
......@@ -728,7 +730,9 @@ test("content_unittests") {
deps += [
"//media/blink",
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/api:libjingle_peerconnection",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc/modules/video_capture",
"//ui/shell_dialogs:shell_dialogs",
......
jingle/BUILD.gn
View file @ d0e9a076
......@@ -90,6 +90,8 @@ if (enable_webrtc || !is_android) {
public_deps = [
"//third_party/libjingle",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
]
deps = [
":jingle_glue",
......@@ -163,6 +165,8 @@ if (enable_webrtc || !is_android) {
public_deps = [
"//third_party/libjingle",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
]
deps = [
":jingle_glue",
......
jingle/jingle.gyp
View file @ d0e9a076
......@@ -96,11 +96,15 @@
'../net/net.gyp:net',
'../third_party/expat/expat.gyp:expat',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
'../url/url.gyp:url_lib',
'jingle_glue',
],
'export_dependent_settings': [
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
],
},
# GN version: //jingle:notifier_test_util
......@@ -175,6 +179,8 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
],
},
],
......
remoting/host/BUILD.gn
View file @ d0e9a076
......@@ -281,6 +281,8 @@ static_library("test_support") {
if (enable_webrtc) {
public_deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/webrtc/modules/desktop_capture",
]
}
......@@ -767,7 +769,11 @@ if (enable_remoting_host && !is_android) {
}
if (enable_webrtc) {
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
]
}
}
......@@ -893,7 +899,11 @@ if (enable_me2me_host) {
}
if (enable_webrtc) {
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
]
}
if (is_desktop_linux) {
......
remoting/protocol/BUILD.gn
View file @ d0e9a076
......@@ -39,7 +39,11 @@ static_library("protocol") {
"//remoting")
if (enable_webrtc) {
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
]
} else {
sources -= [
"webrtc_connection_to_client.cc",
......
remoting/remoting.gyp
View file @ d0e9a076
......@@ -239,11 +239,15 @@
'../third_party/boringssl/boringssl.gyp:boringssl',
'../third_party/expat/expat.gyp:expat',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
'../third_party/libyuv/libyuv.gyp:libyuv',
'remoting_base',
],
'export_dependent_settings': [
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
],
'sources': [
'<@(remoting_protocol_sources)',
......@@ -254,6 +258,8 @@
['enable_webrtc == 1', {
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
],
}],
],
......
remoting/signaling/BUILD.gn
View file @ d0e9a076
......@@ -17,6 +17,8 @@ static_library("signaling") {
public_deps = [
"//remoting/proto",
"//third_party/libjingle",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
]
deps = [
......
third_party/libjingle/BUILD.gn
View file @ d0e9a076
......@@ -6,25 +6,6 @@ import("//build/config/features.gni")
# From third_party/libjingle/libjingle.gyp's target_defaults.
config("jingle_unexported_configs") {
defines = [
"EXPAT_RELATIVE_PATH",
"FEATURE_ENABLE_SSL",
"GTEST_RELATIVE_PATH",
"HAVE_OPENSSL_SSL_H",
"HAVE_SCTP",
"HAVE_SRTP",
"HAVE_WEBRTC_VIDEO",
"HAVE_WEBRTC_VOICE",
"LOGGING_INSIDE_WEBRTC",
"NO_MAIN_THREAD_WRAPPING",
"NO_SOUND_SYSTEM",
"SRTP_RELATIVE_PATH",
"SSL_USE_OPENSSL",
"USE_WEBRTC_DEV_BRANCH",
"ENABLE_EXTERNAL_AUTH",
"WEBRTC_CHROMIUM_BUILD",
]
include_dirs = [
"../../third_party/webrtc_overrides",
"../../testing/gtest/include",
......@@ -41,46 +22,6 @@ config("jingle_public_configs") {
"../../testing/gtest/include",
"../../third_party",
]
defines = [
"FEATURE_ENABLE_SSL",
"FEATURE_ENABLE_VOICEMAIL",
"EXPAT_RELATIVE_PATH",
"GTEST_RELATIVE_PATH",
"NO_MAIN_THREAD_WRAPPING",
"NO_SOUND_SYSTEM",
]
if (is_linux) {
defines += [
"LINUX",
"WEBRTC_LINUX",
]
}
if (is_mac) {
defines += [
"OSX",
"WEBRTC_MAC",
]
}
if (is_ios) {
defines += [
"IOS",
"WEBRTC_MAC",
"WEBRTC_IOS",
]
}
if (is_win) {
defines += [ "WEBRTC_WIN" ]
}
if (is_android) {
defines += [ "ANDROID" ]
}
if (is_posix) {
defines += [ "WEBRTC_POSIX" ]
}
if (is_chromeos) {
defines += [ "CHROMEOS" ]
}
}
# From third_party/libjingle/libjingle.gyp's target_defaults.
......@@ -97,115 +38,19 @@ group("jingle_deps") {
# GYP version: third_party/libjingle.gyp:libjingle
static_library("libjingle") {
p2p_dir = "../webrtc/p2p"
xmllite_dir = "../webrtc/libjingle/xmllite"
xmpp_dir = "../webrtc/libjingle/xmpp"
sources = [
# List from third_party/libjingle/libjingle_common.gypi
"$p2p_dir/base/asyncstuntcpsocket.cc",
"$p2p_dir/base/asyncstuntcpsocket.h",
"$p2p_dir/base/basicpacketsocketfactory.cc",
"$p2p_dir/base/basicpacketsocketfactory.h",
"$p2p_dir/base/candidate.h",
"$p2p_dir/base/common.h",
"$p2p_dir/base/dtlstransport.h",
"$p2p_dir/base/dtlstransportchannel.cc",
"$p2p_dir/base/dtlstransportchannel.h",
"$p2p_dir/base/p2pconstants.cc",
"$p2p_dir/base/p2pconstants.h",
"$p2p_dir/base/p2ptransport.cc",
"$p2p_dir/base/p2ptransport.h",
"$p2p_dir/base/p2ptransportchannel.cc",
"$p2p_dir/base/p2ptransportchannel.h",
"$p2p_dir/base/port.cc",
"$p2p_dir/base/port.h",
"$p2p_dir/base/portallocator.cc",
"$p2p_dir/base/portallocator.h",
"$p2p_dir/base/pseudotcp.cc",
"$p2p_dir/base/pseudotcp.h",
"$p2p_dir/base/relayport.cc",
"$p2p_dir/base/relayport.h",
"$p2p_dir/base/session.cc",
"$p2p_dir/base/session.h",
"$p2p_dir/base/sessiondescription.cc",
"$p2p_dir/base/sessiondescription.h",
"$p2p_dir/base/sessionid.h",
"$p2p_dir/base/stun.cc",
"$p2p_dir/base/stun.h",
"$p2p_dir/base/stunport.cc",
"$p2p_dir/base/stunport.h",
"$p2p_dir/base/stunrequest.cc",
"$p2p_dir/base/stunrequest.h",
"$p2p_dir/base/tcpport.cc",
"$p2p_dir/base/tcpport.h",
"$p2p_dir/base/transport.cc",
"$p2p_dir/base/transport.h",
"$p2p_dir/base/transportchannel.cc",
"$p2p_dir/base/transportchannel.h",
"$p2p_dir/base/transportchannelimpl.h",
"$p2p_dir/base/transportcontroller.cc",
"$p2p_dir/base/transportcontroller.h",
"$p2p_dir/base/transportdescription.cc",
"$p2p_dir/base/transportdescription.h",
"$p2p_dir/base/transportdescriptionfactory.cc",
"$p2p_dir/base/transportdescriptionfactory.h",
"$p2p_dir/base/turnport.cc",
"$p2p_dir/base/turnport.h",
"$p2p_dir/client/basicportallocator.cc",
"$p2p_dir/client/basicportallocator.h",
"$p2p_dir/client/httpportallocator.cc",
"$p2p_dir/client/httpportallocator.h",
"$p2p_dir/client/socketmonitor.cc",
"$p2p_dir/client/socketmonitor.h",
"$xmllite_dir/qname.cc",
"$xmllite_dir/qname.h",
"$xmllite_dir/xmlbuilder.cc",
"$xmllite_dir/xmlbuilder.h",
"$xmllite_dir/xmlconstants.cc",
"$xmllite_dir/xmlconstants.h",
"$xmllite_dir/xmlelement.cc",
"$xmllite_dir/xmlelement.h",
"$xmllite_dir/xmlnsstack.cc",
"$xmllite_dir/xmlnsstack.h",
"$xmllite_dir/xmlparser.cc",
"$xmllite_dir/xmlparser.h",
"$xmllite_dir/xmlprinter.cc",
"$xmllite_dir/xmlprinter.h",
"$xmpp_dir/asyncsocket.h",
"$xmpp_dir/constants.cc",
"$xmpp_dir/constants.h",
"$xmpp_dir/jid.cc",
"$xmpp_dir/jid.h",
"$xmpp_dir/plainsaslhandler.h",
"$xmpp_dir/prexmppauth.h",
"$xmpp_dir/saslcookiemechanism.h",
"$xmpp_dir/saslhandler.h",
"$xmpp_dir/saslmechanism.cc",
"$xmpp_dir/saslmechanism.h",
"$xmpp_dir/saslplainmechanism.h",
"$xmpp_dir/xmppclient.cc",
"$xmpp_dir/xmppclient.h",
"$xmpp_dir/xmppclientsettings.h",
"$xmpp_dir/xmppengine.h",
"$xmpp_dir/xmppengineimpl.cc",
"$xmpp_dir/xmppengineimpl.h",
"$xmpp_dir/xmppengineimpl_iq.cc",
"$xmpp_dir/xmpplogintask.cc",
"$xmpp_dir/xmpplogintask.h",
"$xmpp_dir/xmppstanzaparser.cc",
"$xmpp_dir/xmppstanzaparser.h",
"$xmpp_dir/xmpptask.cc",
"$xmpp_dir/xmpptask.h",
]
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
public_deps = [
":jingle_deps",
# TODO(kjellander): Start cleaning up this target as soon as
# https://codereview.chromium.org/2022833002/ is landed. The target should
# be removed entirely if possible.
"//third_party/webrtc/base:rtc_base",
]
deps = [
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/p2p:rtc_p2p",
]
# From libjingle_common.gypi's conditions list.
......@@ -221,11 +66,19 @@ static_library("libjingle") {
]
} else {
# Otherwise, we just add the field_trial which redirects to base.
sources += [ "../webrtc_overrides/field_trial.cc" ]
sources = [
"../webrtc_overrides/field_trial.cc",
]
}
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_public_configs" ]
configs += [
":jingle_unexported_configs",
"//third_party/webrtc:common_config",
]
public_configs = [
":jingle_public_configs",
"//third_party/webrtc:common_inherited_config",
]
}
if (enable_webrtc) {
......@@ -237,162 +90,39 @@ if (enable_webrtc) {
"../webrtc_overrides/init_webrtc.cc",
"../webrtc_overrides/init_webrtc.h",
]
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_public_configs" ]
configs += [
":jingle_unexported_configs",
"//third_party/webrtc:common_config",
]
public_configs = [
":jingle_public_configs",
"//third_party/webrtc:common_inherited_config",
]
public_deps = [
":libjingle_webrtc_common",
]
}
static_library("libjingle_webrtc_common") {
sources = [
"../webrtc/api/audiotrack.cc",
"../webrtc/api/audiotrack.h",
"../webrtc/api/datachannel.cc",
"../webrtc/api/datachannel.h",
"../webrtc/api/dtmfsender.cc",
"../webrtc/api/dtmfsender.h",
"../webrtc/api/jsep.h",
"../webrtc/api/jsepicecandidate.cc",
"../webrtc/api/jsepicecandidate.h",
"../webrtc/api/jsepsessiondescription.cc",
"../webrtc/api/jsepsessiondescription.h",
"../webrtc/api/localaudiosource.cc",
"../webrtc/api/localaudiosource.h",
"../webrtc/api/mediaconstraintsinterface.cc",
"../webrtc/api/mediaconstraintsinterface.h",
"../webrtc/api/mediacontroller.cc",
"../webrtc/api/mediacontroller.h",
"../webrtc/api/mediastream.cc",
"../webrtc/api/mediastream.h",
"../webrtc/api/mediastreaminterface.h",
"../webrtc/api/mediastreamobserver.cc",
"../webrtc/api/mediastreamobserver.h",
"../webrtc/api/mediastreamprovider.h",
"../webrtc/api/mediastreamproxy.h",
"../webrtc/api/mediastreamtrack.h",
"../webrtc/api/mediastreamtrackproxy.h",
"../webrtc/api/notifier.h",
"../webrtc/api/peerconnection.cc",
"../webrtc/api/peerconnection.h",
"../webrtc/api/peerconnectionfactory.cc",
"../webrtc/api/peerconnectionfactory.h",
"../webrtc/api/peerconnectioninterface.h",
"../webrtc/api/remoteaudiosource.cc",
"../webrtc/api/remoteaudiosource.h",
"../webrtc/api/rtpreceiver.cc",
"../webrtc/api/rtpreceiver.h",
"../webrtc/api/rtpreceiverinterface.h",
"../webrtc/api/rtpsender.cc",
"../webrtc/api/rtpsender.h",
"../webrtc/api/rtpsenderinterface.h",
"../webrtc/api/sctputils.cc",
"../webrtc/api/sctputils.h",
"../webrtc/api/statscollector.cc",
"../webrtc/api/statscollector.h",
"../webrtc/api/statstypes.cc",
"../webrtc/api/statstypes.h",
"../webrtc/api/streamcollection.h",
"../webrtc/api/umametrics.h",
"../webrtc/api/videocapturertracksource.cc",
"../webrtc/api/videocapturertracksource.h",
"../webrtc/api/videosourceproxy.h",
"../webrtc/api/videotrack.cc",
"../webrtc/api/videotrack.h",
"../webrtc/api/videotracksource.cc",
"../webrtc/api/videotracksource.h",
"../webrtc/api/webrtcsdp.cc",
"../webrtc/api/webrtcsdp.h",
"../webrtc/api/webrtcsession.cc",
"../webrtc/api/webrtcsession.h",
"../webrtc/api/webrtcsessiondescriptionfactory.cc",
"../webrtc/api/webrtcsessiondescriptionfactory.h",
"../webrtc/media/base/codec.cc",
"../webrtc/media/base/codec.h",
"../webrtc/media/base/cryptoparams.h",
"../webrtc/media/base/hybriddataengine.h",
"../webrtc/media/base/mediachannel.h",
"../webrtc/media/base/mediaconstants.cc",
"../webrtc/media/base/mediaconstants.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/videobroadcaster.cc",
"../webrtc/media/base/videobroadcaster.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/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/media/sctp/sctpdataengine.cc",
"../webrtc/media/sctp/sctpdataengine.h",
"../webrtc/pc/audiomonitor.cc",
"../webrtc/pc/audiomonitor.h",
"../webrtc/pc/bundlefilter.cc",
"../webrtc/pc/bundlefilter.h",
"../webrtc/pc/channel.cc",
"../webrtc/pc/channel.h",
"../webrtc/pc/channelmanager.cc",
"../webrtc/pc/channelmanager.h",
"../webrtc/pc/currentspeakermonitor.cc",
"../webrtc/pc/currentspeakermonitor.h",
"../webrtc/pc/externalhmac.cc",
"../webrtc/pc/externalhmac.h",
"../webrtc/pc/mediamonitor.cc",
"../webrtc/pc/mediamonitor.h",
"../webrtc/pc/mediasession.cc",
"../webrtc/pc/mediasession.h",
"../webrtc/pc/mediasink.h",
"../webrtc/pc/rtcpmuxfilter.cc",
"../webrtc/pc/rtcpmuxfilter.h",
"../webrtc/pc/srtpfilter.cc",
"../webrtc/pc/srtpfilter.h",
"../webrtc/pc/voicechannel.h",
source_set("libjingle_webrtc_common") {
configs += [
":jingle_unexported_configs",
"//third_party/webrtc:common_config",
]
public_configs = [
":jingle_public_configs",
"//third_party/webrtc:common_inherited_config",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_public_configs" ]
deps = [
":libjingle",
"//third_party/libsrtp",
"//third_party/usrsctp",
"//third_party/webrtc",
"//third_party/webrtc/api:libjingle_peerconnection",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/modules/media_file",
"//third_party/webrtc/modules/video_capture",
"//third_party/webrtc/pc:rtc_pc",
"//third_party/webrtc/system_wrappers",
"//third_party/webrtc/voice_engine",
]
......
third_party/libjingle/libjingle.gyp
View file @ d0e9a076
......@@ -9,24 +9,6 @@
# Most of these settings have been split according to their scope into
# :jingle_unexported_configs and :jingle_public_config in the GN build.
'target_defaults': {
'defines': [
'ENABLE_EXTERNAL_AUTH',
'EXPAT_RELATIVE_PATH',
'FEATURE_ENABLE_SSL',
'GTEST_RELATIVE_PATH',
'HAVE_OPENSSL_SSL_H',
'HAVE_SCTP',
'HAVE_SRTP',
'HAVE_WEBRTC_VIDEO',
'HAVE_WEBRTC_VOICE',
'LOGGING_INSIDE_WEBRTC',
'NO_MAIN_THREAD_WRAPPING',
'NO_SOUND_SYSTEM',
'SRTP_RELATIVE_PATH',
'SSL_USE_OPENSSL',
'USE_WEBRTC_DEV_BRANCH',
'WEBRTC_CHROMIUM_BUILD',
],
'include_dirs': [
'../../third_party/webrtc_overrides',
'../..',
......@@ -52,14 +34,6 @@
'../../testing/gtest/include',
'../../third_party',
],
'defines': [
'FEATURE_ENABLE_SSL',
'FEATURE_ENABLE_VOICEMAIL',
'EXPAT_RELATIVE_PATH',
'GTEST_RELATIVE_PATH',
'NO_MAIN_THREAD_WRAPPING',
'NO_SOUND_SYSTEM',
],
'conditions': [
['OS=="win"', {
'link_settings': {
......@@ -74,66 +48,9 @@
'include_dirs': [
'../third_party/platformsdk_win7/files/Include',
],
'defines': [
'_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267 ],
}],
['OS=="linux"', {
'defines': [
'LINUX',
'WEBRTC_LINUX',
],
}],
['OS=="mac"', {
'defines': [
'OSX',
'WEBRTC_MAC',
],
}],
['OS=="ios"', {
'defines': [
'IOS',
'WEBRTC_MAC',
'WEBRTC_IOS',
],
}],
['OS=="win"', {
'defines': [
'WEBRTC_WIN',
],
}],
['OS=="android"', {
'defines': [
'ANDROID',
],
}],
['os_posix==1', {
'defines': [
'WEBRTC_POSIX',
],
}],
['os_bsd==1', {
'defines': [
'BSD',
],
}],
['OS=="openbsd"', {
'defines': [
'OPENBSD',
],
}],
['OS=="freebsd"', {
'defines': [
'FREEBSD',
],
}],
['chromeos==1', {
'defines': [
'CHROMEOS',
],
}],
],
},
'variables': {
......@@ -148,50 +65,6 @@
'../third_party/platformsdk_win7/files/Include',
],
}],
['OS=="linux"', {
'defines': [
'LINUX',
'WEBRTC_LINUX',
],
}],
['OS=="mac"', {
'defines': [
'OSX',
'WEBRTC_MAC',
],
}],
['OS=="win"', {
'defines': [
'WEBRTC_WIN',
],
}],
['OS=="ios"', {
'defines': [
'IOS',
'WEBRTC_MAC',
'WEBRTC_IOS',
],
}],
['os_posix == 1', {
'defines': [
'WEBRTC_POSIX',
],
}],
['os_bsd==1', {
'defines': [
'BSD',
],
}],
['OS=="openbsd"', {
'defines': [
'OPENBSD',
],
}],
['OS=="freebsd"', {
'defines': [
'FREEBSD',
],
}],
],
},
'targets': [
......@@ -202,7 +75,14 @@
'includes': [ 'libjingle_common.gypi' ],
'dependencies': [
'<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base',
'<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'<(DEPTH)/third_party/webrtc/p2p/p2p.gyp:rtc_p2p',
],
# TODO(kjellander): Start cleaning up this target as soon as
# https://codereview.chromium.org/2022833002/ is landed. The target should
# be removed entirely if possible.
'export_dependent_settings': [
'<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base',
'<(DEPTH)/third_party/webrtc/p2p/p2p.gyp:rtc_p2p',
],
}, # target libjingle
],
......@@ -213,145 +93,14 @@
# GN version: //third_party/libjingle:libjingle_webrtc_common
'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/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/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/remoteaudiosource.cc',
'<(DEPTH)/third_party/webrtc/api/remoteaudiosource.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/videocapturertracksource.cc',
'<(DEPTH)/third_party/webrtc/api/videocapturertracksource.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/videotracksource.cc',
'<(DEPTH)/third_party/webrtc/api/videotracksource.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/codec.cc',
'<(DEPTH)/third_party/webrtc/media/base/codec.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/mediaconstants.cc',
'<(DEPTH)/third_party/webrtc/media/base/mediaconstants.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/videobroadcaster.cc',
'<(DEPTH)/third_party/webrtc/media/base/videobroadcaster.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/base/videosourcebase.cc',
'<(DEPTH)/third_party/webrtc/media/base/videosourcebase.h',
'<(DEPTH)/third_party/webrtc/media/engine/simulcast.cc',
'<(DEPTH)/third_party/webrtc/media/engine/simulcast.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtccommon.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoe.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.h',
'<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.cc',
'<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.h',
'<(DEPTH)/third_party/webrtc/pc/audiomonitor.cc',
'<(DEPTH)/third_party/webrtc/pc/audiomonitor.h',
'<(DEPTH)/third_party/webrtc/pc/bundlefilter.cc',
'<(DEPTH)/third_party/webrtc/pc/bundlefilter.h',
'<(DEPTH)/third_party/webrtc/pc/channel.cc',
'<(DEPTH)/third_party/webrtc/pc/channel.h',
'<(DEPTH)/third_party/webrtc/pc/channelmanager.cc',
'<(DEPTH)/third_party/webrtc/pc/channelmanager.h',
'<(DEPTH)/third_party/webrtc/pc/currentspeakermonitor.cc',
'<(DEPTH)/third_party/webrtc/pc/currentspeakermonitor.h',
'<(DEPTH)/third_party/webrtc/pc/externalhmac.cc',
'<(DEPTH)/third_party/webrtc/pc/externalhmac.h',
'<(DEPTH)/third_party/webrtc/pc/mediamonitor.cc',
'<(DEPTH)/third_party/webrtc/pc/mediamonitor.h',
'<(DEPTH)/third_party/webrtc/pc/mediasession.cc',
'<(DEPTH)/third_party/webrtc/pc/mediasession.h',
'<(DEPTH)/third_party/webrtc/pc/mediasink.h',
'<(DEPTH)/third_party/webrtc/pc/rtcpmuxfilter.cc',
'<(DEPTH)/third_party/webrtc/pc/rtcpmuxfilter.h',
'<(DEPTH)/third_party/webrtc/pc/srtpfilter.cc',
'<(DEPTH)/third_party/webrtc/pc/srtpfilter.h',
'<(DEPTH)/third_party/webrtc/pc/voicechannel.h',
],
'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
'<(DEPTH)/third_party/webrtc/api/api.gyp:libjingle_peerconnection',
'<(DEPTH)/third_party/webrtc/media/media.gyp:rtc_media',
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture',
'<(DEPTH)/third_party/webrtc/pc/pc.gyp:rtc_pc',
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
'<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
'libjingle',
......
third_party/libjingle/libjingle_common.gypi
View file @ d0e9a076
......@@ -3,112 +3,14 @@
# found in the LICENSE file.
{
'variables': {
'nacl_untrusted_build%': 0,
'webrtc_p2p': "../webrtc/p2p",
'webrtc_xmpp': "../webrtc/libjingle/xmpp",
},
'sources': [
'../webrtc_overrides/field_trial.cc',
'<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
'<(webrtc_p2p)/base/asyncstuntcpsocket.h',
'<(webrtc_p2p)/base/basicpacketsocketfactory.cc',
'<(webrtc_p2p)/base/basicpacketsocketfactory.h',
'<(webrtc_p2p)/base/candidate.h',
'<(webrtc_p2p)/base/common.h',
'<(webrtc_p2p)/base/dtlstransport.h',
'<(webrtc_p2p)/base/dtlstransportchannel.cc',
'<(webrtc_p2p)/base/dtlstransportchannel.h',
'<(webrtc_p2p)/base/p2pconstants.cc',
'<(webrtc_p2p)/base/p2pconstants.h',
'<(webrtc_p2p)/base/p2ptransport.cc',
'<(webrtc_p2p)/base/p2ptransport.h',
'<(webrtc_p2p)/base/p2ptransportchannel.cc',
'<(webrtc_p2p)/base/p2ptransportchannel.h',
'<(webrtc_p2p)/base/port.cc',
'<(webrtc_p2p)/base/port.h',
'<(webrtc_p2p)/base/portallocator.cc',
'<(webrtc_p2p)/base/portallocator.h',
'<(webrtc_p2p)/base/pseudotcp.cc',
'<(webrtc_p2p)/base/pseudotcp.h',
'<(webrtc_p2p)/base/relayport.cc',
'<(webrtc_p2p)/base/relayport.h',
'<(webrtc_p2p)/base/session.cc',
'<(webrtc_p2p)/base/session.h',
'<(webrtc_p2p)/base/sessiondescription.cc',
'<(webrtc_p2p)/base/sessiondescription.h',
'<(webrtc_p2p)/base/sessionid.h',
'<(webrtc_p2p)/base/stun.cc',
'<(webrtc_p2p)/base/stun.h',
'<(webrtc_p2p)/base/stunport.cc',
'<(webrtc_p2p)/base/stunport.h',
'<(webrtc_p2p)/base/stunrequest.cc',
'<(webrtc_p2p)/base/stunrequest.h',
'<(webrtc_p2p)/base/tcpport.cc',
'<(webrtc_p2p)/base/tcpport.h',
'<(webrtc_p2p)/base/transport.cc',
'<(webrtc_p2p)/base/transport.h',
'<(webrtc_p2p)/base/transportchannel.cc',
'<(webrtc_p2p)/base/transportchannel.h',
'<(webrtc_p2p)/base/transportchannelimpl.h',
'<(webrtc_p2p)/base/transportcontroller.cc',
'<(webrtc_p2p)/base/transportcontroller.h',
'<(webrtc_p2p)/base/transportdescription.cc',
'<(webrtc_p2p)/base/transportdescription.h',
'<(webrtc_p2p)/base/transportdescriptionfactory.cc',
'<(webrtc_p2p)/base/transportdescriptionfactory.h',
'<(webrtc_p2p)/base/turnport.cc',
'<(webrtc_p2p)/base/turnport.h',
'<(webrtc_p2p)/client/basicportallocator.cc',
'<(webrtc_p2p)/client/basicportallocator.h',
'<(webrtc_p2p)/client/httpportallocator.cc',
'<(webrtc_p2p)/client/httpportallocator.h',
'<(webrtc_p2p)/client/socketmonitor.cc',
'<(webrtc_p2p)/client/socketmonitor.h',
'<(webrtc_xmpp)/asyncsocket.h',
'<(webrtc_xmpp)/constants.cc',
'<(webrtc_xmpp)/constants.h',
'<(webrtc_xmpp)/jid.cc',
'<(webrtc_xmpp)/jid.h',
'<(webrtc_xmpp)/plainsaslhandler.h',
'<(webrtc_xmpp)/prexmppauth.h',
'<(webrtc_xmpp)/saslcookiemechanism.h',
'<(webrtc_xmpp)/saslhandler.h',
'<(webrtc_xmpp)/saslmechanism.cc',
'<(webrtc_xmpp)/saslmechanism.h',
'<(webrtc_xmpp)/saslplainmechanism.h',
'<(webrtc_xmpp)/xmppclient.cc',
'<(webrtc_xmpp)/xmppclient.h',
'<(webrtc_xmpp)/xmppclientsettings.h',
'<(webrtc_xmpp)/xmppengine.h',
'<(webrtc_xmpp)/xmppengineimpl.cc',
'<(webrtc_xmpp)/xmppengineimpl.h',
'<(webrtc_xmpp)/xmppengineimpl_iq.cc',
'<(webrtc_xmpp)/xmpplogintask.cc',
'<(webrtc_xmpp)/xmpplogintask.h',
'<(webrtc_xmpp)/xmppstanzaparser.cc',
'<(webrtc_xmpp)/xmppstanzaparser.h',
'<(webrtc_xmpp)/xmpptask.cc',
'<(webrtc_xmpp)/xmpptask.h',
],
'conditions': [
['OS=="win" and nacl_untrusted_build==0', {
# Suppress warnings about WIN32_LEAN_AND_MEAN.
'msvs_disabled_warnings': [ 4005, 4267 ],
}, {
'sources/': [
['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
],
}],
['os_posix!=1 and nacl_untrusted_build==0', {
'sources/': [
['exclude', '/unix[a-z]+\\.(h|cc)$'],
],
}],
['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
'sources/': [
['exclude', '/mac[a-z]+\\.(h|cc)$'],
['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
['OS=="win"', {
'msvs_disabled_warnings': [
4005, # WIN32_LEAN_AND_MEAN.
4267, # size_t to int truncations.
],
}],
],
......
third_party/webrtc_overrides/DEPS
View file @ d0e9a076
......@@ -2,4 +2,5 @@ include_rules = [
'+base',
'+net/base',
'+third_party/webrtc',
'+third_party/webrtc_overrides',
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment