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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/BUILD.gn

Issue 653203005: Roll WebRTC 7546:7549. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Decreased the number of gyp changes in this patch since thats the only major change (the reset is j… Created 6 years, 2 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/test/fake_socket_factory.h ('k') | third_party/libjingle/README.chromium » ('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 7d8063188dfefd54070617bf7de1cf256aae29c4..38f0a020a368a9afb59cf6ef9bd93dd35c2f937a 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -129,124 +129,127 @@ 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
- "source/talk/p2p/base/asyncstuntcpsocket.cc",
- "source/talk/p2p/base/asyncstuntcpsocket.h",
- "source/talk/p2p/base/basicpacketsocketfactory.cc",
- "source/talk/p2p/base/basicpacketsocketfactory.h",
- "source/talk/p2p/base/candidate.h",
- "source/talk/p2p/base/common.h",
- "source/talk/p2p/base/constants.cc",
- "source/talk/p2p/base/constants.h",
- "source/talk/p2p/base/dtlstransport.h",
- "source/talk/p2p/base/dtlstransportchannel.cc",
- "source/talk/p2p/base/dtlstransportchannel.h",
- "source/talk/p2p/base/p2ptransport.cc",
- "source/talk/p2p/base/p2ptransport.h",
- "source/talk/p2p/base/p2ptransportchannel.cc",
- "source/talk/p2p/base/p2ptransportchannel.h",
- "source/talk/p2p/base/parsing.cc",
- "source/talk/p2p/base/parsing.h",
- "source/talk/p2p/base/port.cc",
- "source/talk/p2p/base/port.h",
- "source/talk/p2p/base/portallocator.cc",
- "source/talk/p2p/base/portallocator.h",
- "source/talk/p2p/base/portallocatorsessionproxy.cc",
- "source/talk/p2p/base/portallocatorsessionproxy.h",
- "source/talk/p2p/base/portproxy.cc",
- "source/talk/p2p/base/portproxy.h",
- "source/talk/p2p/base/pseudotcp.cc",
- "source/talk/p2p/base/pseudotcp.h",
- "source/talk/p2p/base/rawtransport.cc",
- "source/talk/p2p/base/rawtransport.h",
- "source/talk/p2p/base/rawtransportchannel.cc",
- "source/talk/p2p/base/rawtransportchannel.h",
- "source/talk/p2p/base/relayport.cc",
- "source/talk/p2p/base/relayport.h",
- "source/talk/p2p/base/session.cc",
- "source/talk/p2p/base/session.h",
- "source/talk/p2p/base/sessionclient.h",
- "source/talk/p2p/base/sessiondescription.cc",
- "source/talk/p2p/base/sessiondescription.h",
- "source/talk/p2p/base/sessionid.h",
- "source/talk/p2p/base/sessionmanager.cc",
- "source/talk/p2p/base/sessionmanager.h",
- "source/talk/p2p/base/sessionmessages.cc",
- "source/talk/p2p/base/sessionmessages.h",
- "source/talk/p2p/base/stun.cc",
- "source/talk/p2p/base/stun.h",
- "source/talk/p2p/base/stunport.cc",
- "source/talk/p2p/base/stunport.h",
- "source/talk/p2p/base/stunrequest.cc",
- "source/talk/p2p/base/stunrequest.h",
- "source/talk/p2p/base/tcpport.cc",
- "source/talk/p2p/base/tcpport.h",
- "source/talk/p2p/base/transport.cc",
- "source/talk/p2p/base/transport.h",
- "source/talk/p2p/base/transportchannel.cc",
- "source/talk/p2p/base/transportchannel.h",
- "source/talk/p2p/base/transportchannelimpl.h",
- "source/talk/p2p/base/transportchannelproxy.cc",
- "source/talk/p2p/base/transportchannelproxy.h",
- "source/talk/p2p/base/transportdescription.cc",
- "source/talk/p2p/base/transportdescription.h",
- "source/talk/p2p/base/transportdescriptionfactory.cc",
- "source/talk/p2p/base/transportdescriptionfactory.h",
- "source/talk/p2p/base/turnport.cc",
- "source/talk/p2p/base/turnport.h",
- "source/talk/p2p/client/basicportallocator.cc",
- "source/talk/p2p/client/basicportallocator.h",
- "source/talk/p2p/client/httpportallocator.cc",
- "source/talk/p2p/client/httpportallocator.h",
- "source/talk/p2p/client/sessionmanagertask.h",
- "source/talk/p2p/client/sessionsendtask.h",
- "source/talk/p2p/client/socketmonitor.cc",
- "source/talk/p2p/client/socketmonitor.h",
- "source/talk/xmllite/qname.cc",
- "source/talk/xmllite/qname.h",
- "source/talk/xmllite/xmlbuilder.cc",
- "source/talk/xmllite/xmlbuilder.h",
- "source/talk/xmllite/xmlconstants.cc",
- "source/talk/xmllite/xmlconstants.h",
- "source/talk/xmllite/xmlelement.cc",
- "source/talk/xmllite/xmlelement.h",
- "source/talk/xmllite/xmlnsstack.cc",
- "source/talk/xmllite/xmlnsstack.h",
- "source/talk/xmllite/xmlparser.cc",
- "source/talk/xmllite/xmlparser.h",
- "source/talk/xmllite/xmlprinter.cc",
- "source/talk/xmllite/xmlprinter.h",
- "source/talk/xmpp/asyncsocket.h",
- "source/talk/xmpp/constants.cc",
- "source/talk/xmpp/constants.h",
- "source/talk/xmpp/jid.cc",
- "source/talk/xmpp/jid.h",
- "source/talk/xmpp/plainsaslhandler.h",
- "source/talk/xmpp/prexmppauth.h",
- "source/talk/xmpp/saslcookiemechanism.h",
- "source/talk/xmpp/saslhandler.h",
- "source/talk/xmpp/saslmechanism.cc",
- "source/talk/xmpp/saslmechanism.h",
- "source/talk/xmpp/saslplainmechanism.h",
- "source/talk/xmpp/xmppclient.cc",
- "source/talk/xmpp/xmppclient.h",
- "source/talk/xmpp/xmppclientsettings.h",
- "source/talk/xmpp/xmppengine.h",
- "source/talk/xmpp/xmppengineimpl.cc",
- "source/talk/xmpp/xmppengineimpl.h",
- "source/talk/xmpp/xmppengineimpl_iq.cc",
- "source/talk/xmpp/xmpplogintask.cc",
- "source/talk/xmpp/xmpplogintask.h",
- "source/talk/xmpp/xmppstanzaparser.cc",
- "source/talk/xmpp/xmppstanzaparser.h",
- "source/talk/xmpp/xmpptask.cc",
- "source/talk/xmpp/xmpptask.h",
+ "$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/constants.cc",
+ "$p2p_dir/base/constants.h",
+ "$p2p_dir/base/dtlstransport.h",
+ "$p2p_dir/base/dtlstransportchannel.cc",
+ "$p2p_dir/base/dtlstransportchannel.h",
+ "$p2p_dir/base/p2ptransport.cc",
+ "$p2p_dir/base/p2ptransport.h",
+ "$p2p_dir/base/p2ptransportchannel.cc",
+ "$p2p_dir/base/p2ptransportchannel.h",
+ "$p2p_dir/base/parsing.cc",
+ "$p2p_dir/base/parsing.h",
+ "$p2p_dir/base/port.cc",
+ "$p2p_dir/base/port.h",
+ "$p2p_dir/base/portallocator.cc",
+ "$p2p_dir/base/portallocator.h",
+ "$p2p_dir/base/portallocatorsessionproxy.cc",
+ "$p2p_dir/base/portallocatorsessionproxy.h",
+ "$p2p_dir/base/portproxy.cc",
+ "$p2p_dir/base/portproxy.h",
+ "$p2p_dir/base/pseudotcp.cc",
+ "$p2p_dir/base/pseudotcp.h",
+ "$p2p_dir/base/rawtransport.cc",
+ "$p2p_dir/base/rawtransport.h",
+ "$p2p_dir/base/rawtransportchannel.cc",
+ "$p2p_dir/base/rawtransportchannel.h",
+ "$p2p_dir/base/relayport.cc",
+ "$p2p_dir/base/relayport.h",
+ "$p2p_dir/base/session.cc",
+ "$p2p_dir/base/session.h",
+ "$p2p_dir/base/sessionclient.h",
+ "$p2p_dir/base/sessiondescription.cc",
+ "$p2p_dir/base/sessiondescription.h",
+ "$p2p_dir/base/sessionid.h",
+ "$p2p_dir/base/sessionmanager.cc",
+ "$p2p_dir/base/sessionmanager.h",
+ "$p2p_dir/base/sessionmessages.cc",
+ "$p2p_dir/base/sessionmessages.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/transportchannelproxy.cc",
+ "$p2p_dir/base/transportchannelproxy.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/sessionmanagertask.h",
+ "$p2p_dir/client/sessionsendtask.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",
]
sources -= [
# Compiled as part of libjingle_p2p_constants.
- "source/talk/p2p/base/constants.cc",
- "source/talk/p2p/base/constants.h",
+ "$p2p_dir/base/constants.cc",
+ "$p2p_dir/base/constants.h",
]
public_deps = [
":jingle_deps"
@@ -282,9 +285,10 @@ static_library("libjingle") {
#
# GYP version: third_party/libjingle.gyp:libjingle_p2p_constants
static_library("libjingle_p2p_constants") {
+ p2p_dir = "../webrtc/p2p"
sources = [
- "source/talk/p2p/base/constants.cc",
- "source/talk/p2p/base/constants.h",
+ "$p2p_dir/base/constants.cc",
+ "$p2p_dir/base/constants.h",
]
public_deps = [
":jingle_deps",
« no previous file with comments | « remoting/test/fake_socket_factory.h ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698