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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle_common.gypi

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 | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle_common.gypi
diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi
index eb9cbe614983a6524acc7882b06d9433dd50cf8e..8aa2a1690aca67cc57bfb76dba6f08e4afcaf772 100644
--- a/third_party/libjingle/libjingle_common.gypi
+++ b/third_party/libjingle/libjingle_common.gypi
@@ -5,105 +5,107 @@
{
'variables': {
'nacl_untrusted_build%': 0,
+ 'webrtc_p2p': "../webrtc/p2p",
+ 'webrtc_xmpp': "../webrtc/libjingle/xmpp",
},
'sources': [
- '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.cc',
- '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.h',
- '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.cc',
- '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.h',
- '<(libjingle_source)/talk/p2p/base/candidate.h',
- '<(libjingle_source)/talk/p2p/base/common.h',
- '<(libjingle_source)/talk/p2p/base/constants.cc',
- '<(libjingle_source)/talk/p2p/base/constants.h',
- '<(libjingle_source)/talk/p2p/base/dtlstransport.h',
- '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.cc',
- '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.h',
- '<(libjingle_source)/talk/p2p/base/p2ptransport.cc',
- '<(libjingle_source)/talk/p2p/base/p2ptransport.h',
- '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.cc',
- '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.h',
- '<(libjingle_source)/talk/p2p/base/parsing.cc',
- '<(libjingle_source)/talk/p2p/base/parsing.h',
- '<(libjingle_source)/talk/p2p/base/port.cc',
- '<(libjingle_source)/talk/p2p/base/port.h',
- '<(libjingle_source)/talk/p2p/base/portallocator.cc',
- '<(libjingle_source)/talk/p2p/base/portallocator.h',
- '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.cc',
- '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.h',
- '<(libjingle_source)/talk/p2p/base/portproxy.cc',
- '<(libjingle_source)/talk/p2p/base/portproxy.h',
- '<(libjingle_source)/talk/p2p/base/pseudotcp.cc',
- '<(libjingle_source)/talk/p2p/base/pseudotcp.h',
- '<(libjingle_source)/talk/p2p/base/rawtransport.cc',
- '<(libjingle_source)/talk/p2p/base/rawtransport.h',
- '<(libjingle_source)/talk/p2p/base/rawtransportchannel.cc',
- '<(libjingle_source)/talk/p2p/base/rawtransportchannel.h',
- '<(libjingle_source)/talk/p2p/base/relayport.cc',
- '<(libjingle_source)/talk/p2p/base/relayport.h',
- '<(libjingle_source)/talk/p2p/base/session.cc',
- '<(libjingle_source)/talk/p2p/base/session.h',
- '<(libjingle_source)/talk/p2p/base/sessionclient.h',
- '<(libjingle_source)/talk/p2p/base/sessiondescription.cc',
- '<(libjingle_source)/talk/p2p/base/sessiondescription.h',
- '<(libjingle_source)/talk/p2p/base/sessionid.h',
- '<(libjingle_source)/talk/p2p/base/sessionmanager.cc',
- '<(libjingle_source)/talk/p2p/base/sessionmanager.h',
- '<(libjingle_source)/talk/p2p/base/sessionmessages.cc',
- '<(libjingle_source)/talk/p2p/base/sessionmessages.h',
- '<(libjingle_source)/talk/p2p/base/stun.cc',
- '<(libjingle_source)/talk/p2p/base/stun.h',
- '<(libjingle_source)/talk/p2p/base/stunport.cc',
- '<(libjingle_source)/talk/p2p/base/stunport.h',
- '<(libjingle_source)/talk/p2p/base/stunrequest.cc',
- '<(libjingle_source)/talk/p2p/base/stunrequest.h',
- '<(libjingle_source)/talk/p2p/base/tcpport.cc',
- '<(libjingle_source)/talk/p2p/base/tcpport.h',
- '<(libjingle_source)/talk/p2p/base/transport.cc',
- '<(libjingle_source)/talk/p2p/base/transport.h',
- '<(libjingle_source)/talk/p2p/base/transportchannel.cc',
- '<(libjingle_source)/talk/p2p/base/transportchannel.h',
- '<(libjingle_source)/talk/p2p/base/transportchannelimpl.h',
- '<(libjingle_source)/talk/p2p/base/transportchannelproxy.cc',
- '<(libjingle_source)/talk/p2p/base/transportchannelproxy.h',
- '<(libjingle_source)/talk/p2p/base/transportdescription.cc',
- '<(libjingle_source)/talk/p2p/base/transportdescription.h',
- '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.cc',
- '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.h',
- '<(libjingle_source)/talk/p2p/base/turnport.cc',
- '<(libjingle_source)/talk/p2p/base/turnport.h',
- '<(libjingle_source)/talk/p2p/client/basicportallocator.cc',
- '<(libjingle_source)/talk/p2p/client/basicportallocator.h',
- '<(libjingle_source)/talk/p2p/client/httpportallocator.cc',
- '<(libjingle_source)/talk/p2p/client/httpportallocator.h',
- '<(libjingle_source)/talk/p2p/client/sessionmanagertask.h',
- '<(libjingle_source)/talk/p2p/client/sessionsendtask.h',
- '<(libjingle_source)/talk/p2p/client/socketmonitor.cc',
- '<(libjingle_source)/talk/p2p/client/socketmonitor.h',
- '<(libjingle_source)/talk/xmpp/asyncsocket.h',
- '<(libjingle_source)/talk/xmpp/constants.cc',
- '<(libjingle_source)/talk/xmpp/constants.h',
- '<(libjingle_source)/talk/xmpp/jid.cc',
- '<(libjingle_source)/talk/xmpp/jid.h',
- '<(libjingle_source)/talk/xmpp/plainsaslhandler.h',
- '<(libjingle_source)/talk/xmpp/prexmppauth.h',
- '<(libjingle_source)/talk/xmpp/saslcookiemechanism.h',
- '<(libjingle_source)/talk/xmpp/saslhandler.h',
- '<(libjingle_source)/talk/xmpp/saslmechanism.cc',
- '<(libjingle_source)/talk/xmpp/saslmechanism.h',
- '<(libjingle_source)/talk/xmpp/saslplainmechanism.h',
- '<(libjingle_source)/talk/xmpp/xmppclient.cc',
- '<(libjingle_source)/talk/xmpp/xmppclient.h',
- '<(libjingle_source)/talk/xmpp/xmppclientsettings.h',
- '<(libjingle_source)/talk/xmpp/xmppengine.h',
- '<(libjingle_source)/talk/xmpp/xmppengineimpl.cc',
- '<(libjingle_source)/talk/xmpp/xmppengineimpl.h',
- '<(libjingle_source)/talk/xmpp/xmppengineimpl_iq.cc',
- '<(libjingle_source)/talk/xmpp/xmpplogintask.cc',
- '<(libjingle_source)/talk/xmpp/xmpplogintask.h',
- '<(libjingle_source)/talk/xmpp/xmppstanzaparser.cc',
- '<(libjingle_source)/talk/xmpp/xmppstanzaparser.h',
- '<(libjingle_source)/talk/xmpp/xmpptask.cc',
- '<(libjingle_source)/talk/xmpp/xmpptask.h',
+ '<(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/constants.cc',
+ '<(webrtc_p2p)/base/constants.h',
+ '<(webrtc_p2p)/base/dtlstransport.h',
+ '<(webrtc_p2p)/base/dtlstransportchannel.cc',
+ '<(webrtc_p2p)/base/dtlstransportchannel.h',
+ '<(webrtc_p2p)/base/p2ptransport.cc',
+ '<(webrtc_p2p)/base/p2ptransport.h',
+ '<(webrtc_p2p)/base/p2ptransportchannel.cc',
+ '<(webrtc_p2p)/base/p2ptransportchannel.h',
+ '<(webrtc_p2p)/base/parsing.cc',
+ '<(webrtc_p2p)/base/parsing.h',
+ '<(webrtc_p2p)/base/port.cc',
+ '<(webrtc_p2p)/base/port.h',
+ '<(webrtc_p2p)/base/portallocator.cc',
+ '<(webrtc_p2p)/base/portallocator.h',
+ '<(webrtc_p2p)/base/portallocatorsessionproxy.cc',
+ '<(webrtc_p2p)/base/portallocatorsessionproxy.h',
+ '<(webrtc_p2p)/base/portproxy.cc',
+ '<(webrtc_p2p)/base/portproxy.h',
+ '<(webrtc_p2p)/base/pseudotcp.cc',
+ '<(webrtc_p2p)/base/pseudotcp.h',
+ '<(webrtc_p2p)/base/rawtransport.cc',
+ '<(webrtc_p2p)/base/rawtransport.h',
+ '<(webrtc_p2p)/base/rawtransportchannel.cc',
+ '<(webrtc_p2p)/base/rawtransportchannel.h',
+ '<(webrtc_p2p)/base/relayport.cc',
+ '<(webrtc_p2p)/base/relayport.h',
+ '<(webrtc_p2p)/base/session.cc',
+ '<(webrtc_p2p)/base/session.h',
+ '<(webrtc_p2p)/base/sessionclient.h',
+ '<(webrtc_p2p)/base/sessiondescription.cc',
+ '<(webrtc_p2p)/base/sessiondescription.h',
+ '<(webrtc_p2p)/base/sessionid.h',
+ '<(webrtc_p2p)/base/sessionmanager.cc',
+ '<(webrtc_p2p)/base/sessionmanager.h',
+ '<(webrtc_p2p)/base/sessionmessages.cc',
+ '<(webrtc_p2p)/base/sessionmessages.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/transportchannelproxy.cc',
+ '<(webrtc_p2p)/base/transportchannelproxy.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/sessionmanagertask.h',
+ '<(webrtc_p2p)/client/sessionsendtask.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', {
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698