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

Unified Diff: third_party/libjingle/libjingle_common.gypi

Issue 2022833002: Migrate libjingle to WebRTC build targets. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 5 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/webrtc_overrides/DEPS » ('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 4ef1c542d36e2f0928c88fa56daa6124403489b6..62766fe94c3786435778545eb4fa7740f39523a9 100644
--- a/third_party/libjingle/libjingle_common.gypi
+++ b/third_party/libjingle/libjingle_common.gypi
@@ -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.
],
}],
],
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/webrtc_overrides/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698