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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 173013003: Compile libjingle for PNaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 6 years, 10 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 | « no previous file | third_party/libjingle/libjingle_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 0154a3b5b87ce7a172194fabad8af689907ffa78..6e8319f6f8cf923c0d27c1a6c9081e3809cb5e97 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -22,7 +22,6 @@
'HAVE_SRTP',
'HAVE_WEBRTC_VIDEO',
'HAVE_WEBRTC_VOICE',
- 'JSONCPP_RELATIVE_PATH',
'LOGGING_INSIDE_LIBJINGLE',
'NO_MAIN_THREAD_WRAPPING',
'NO_SOUND_SYSTEM',
@@ -68,7 +67,6 @@
'FEATURE_ENABLE_VOICEMAIL',
'EXPAT_RELATIVE_PATH',
'GTEST_RELATIVE_PATH',
- 'JSONCPP_RELATIVE_PATH',
'NO_MAIN_THREAD_WRAPPING',
'NO_SOUND_SYSTEM',
],
@@ -242,354 +240,30 @@
{
'target_name': 'libjingle',
'type': 'static_library',
+ 'includes': [ 'libjingle_common.gypi' ],
'sources': [
'overrides/talk/base/basictypes.h',
'overrides/talk/base/constructormagic.h',
+ 'overrides/talk/base/win32socketinit.cc',
# Overrides logging.h/.cc because libjingle logging should be done to
# the same place as the chromium logging.
'overrides/talk/base/logging.cc',
'overrides/talk/base/logging.h',
+ ],
+ 'sources!' : [
+ # Compiled as part of libjingle_p2p_constants.
+ '<(libjingle_source)/talk/p2p/base/constants.cc',
+ '<(libjingle_source)/talk/p2p/base/constants.h',
- '<(libjingle_source)/talk/base/asyncfile.cc',
- '<(libjingle_source)/talk/base/asyncfile.h',
- '<(libjingle_source)/talk/base/asynchttprequest.cc',
- '<(libjingle_source)/talk/base/asynchttprequest.h',
- '<(libjingle_source)/talk/base/asyncpacketsocket.h',
- '<(libjingle_source)/talk/base/asyncsocket.cc',
- '<(libjingle_source)/talk/base/asyncsocket.h',
- '<(libjingle_source)/talk/base/asynctcpsocket.cc',
- '<(libjingle_source)/talk/base/asynctcpsocket.h',
- '<(libjingle_source)/talk/base/asyncudpsocket.cc',
- '<(libjingle_source)/talk/base/asyncudpsocket.h',
- '<(libjingle_source)/talk/base/autodetectproxy.cc',
- '<(libjingle_source)/talk/base/autodetectproxy.h',
- '<(libjingle_source)/talk/base/base64.cc',
- '<(libjingle_source)/talk/base/base64.h',
- '<(libjingle_source)/talk/base/basicdefs.h',
- '<(libjingle_source)/talk/base/bytebuffer.cc',
- '<(libjingle_source)/talk/base/bytebuffer.h',
- '<(libjingle_source)/talk/base/byteorder.h',
- '<(libjingle_source)/talk/base/checks.cc',
- '<(libjingle_source)/talk/base/checks.h',
- '<(libjingle_source)/talk/base/common.cc',
- '<(libjingle_source)/talk/base/common.h',
- '<(libjingle_source)/talk/base/compile_assert.h',
- '<(libjingle_source)/talk/base/cpumonitor.cc',
- '<(libjingle_source)/talk/base/cpumonitor.h',
- '<(libjingle_source)/talk/base/crc32.cc',
- '<(libjingle_source)/talk/base/crc32.h',
- '<(libjingle_source)/talk/base/criticalsection.h',
- '<(libjingle_source)/talk/base/cryptstring.h',
- '<(libjingle_source)/talk/base/diskcache.cc',
- '<(libjingle_source)/talk/base/diskcache.h',
- '<(libjingle_source)/talk/base/dscp.h',
- '<(libjingle_source)/talk/base/event.cc',
- '<(libjingle_source)/talk/base/event.h',
- '<(libjingle_source)/talk/base/fileutils.cc',
- '<(libjingle_source)/talk/base/fileutils.h',
- '<(libjingle_source)/talk/base/firewallsocketserver.cc',
- '<(libjingle_source)/talk/base/firewallsocketserver.h',
- '<(libjingle_source)/talk/base/flags.cc',
- '<(libjingle_source)/talk/base/flags.h',
- '<(libjingle_source)/talk/base/helpers.cc',
- '<(libjingle_source)/talk/base/helpers.h',
- '<(libjingle_source)/talk/base/httpbase.cc',
- '<(libjingle_source)/talk/base/httpbase.h',
- '<(libjingle_source)/talk/base/httpclient.cc',
- '<(libjingle_source)/talk/base/httpclient.h',
- '<(libjingle_source)/talk/base/httpcommon-inl.h',
- '<(libjingle_source)/talk/base/httpcommon.cc',
- '<(libjingle_source)/talk/base/httpcommon.h',
- '<(libjingle_source)/talk/base/httprequest.cc',
- '<(libjingle_source)/talk/base/httprequest.h',
- '<(libjingle_source)/talk/base/ipaddress.cc',
- '<(libjingle_source)/talk/base/ipaddress.h',
- '<(libjingle_source)/talk/base/json.cc',
- '<(libjingle_source)/talk/base/json.h',
- '<(libjingle_source)/talk/base/linked_ptr.h',
- '<(libjingle_source)/talk/base/md5.cc',
- '<(libjingle_source)/talk/base/md5.h',
- '<(libjingle_source)/talk/base/md5digest.h',
- '<(libjingle_source)/talk/base/messagedigest.cc',
- '<(libjingle_source)/talk/base/messagedigest.h',
- '<(libjingle_source)/talk/base/messagehandler.cc',
- '<(libjingle_source)/talk/base/messagehandler.h',
- '<(libjingle_source)/talk/base/messagequeue.cc',
- '<(libjingle_source)/talk/base/messagequeue.h',
- '<(libjingle_source)/talk/base/move.h',
- '<(libjingle_source)/talk/base/nethelpers.cc',
- '<(libjingle_source)/talk/base/nethelpers.h',
- '<(libjingle_source)/talk/base/network.cc',
- '<(libjingle_source)/talk/base/network.h',
- '<(libjingle_source)/talk/base/nssidentity.cc',
- '<(libjingle_source)/talk/base/nssidentity.h',
- '<(libjingle_source)/talk/base/nssstreamadapter.cc',
- '<(libjingle_source)/talk/base/nssstreamadapter.h',
- '<(libjingle_source)/talk/base/nullsocketserver.h',
- '<(libjingle_source)/talk/base/pathutils.cc',
- '<(libjingle_source)/talk/base/pathutils.h',
- '<(libjingle_source)/talk/base/physicalsocketserver.cc',
- '<(libjingle_source)/talk/base/physicalsocketserver.h',
- '<(libjingle_source)/talk/base/proxydetect.cc',
- '<(libjingle_source)/talk/base/proxydetect.h',
- '<(libjingle_source)/talk/base/proxyinfo.cc',
- '<(libjingle_source)/talk/base/proxyinfo.h',
- '<(libjingle_source)/talk/base/ratelimiter.cc',
- '<(libjingle_source)/talk/base/ratelimiter.h',
- '<(libjingle_source)/talk/base/ratetracker.cc',
- '<(libjingle_source)/talk/base/ratetracker.h',
- '<(libjingle_source)/talk/base/scoped_ptr.h',
- '<(libjingle_source)/talk/base/sec_buffer.h',
- '<(libjingle_source)/talk/base/sha1.cc',
- '<(libjingle_source)/talk/base/sha1.h',
- '<(libjingle_source)/talk/base/sha1digest.h',
- '<(libjingle_source)/talk/base/signalthread.cc',
- '<(libjingle_source)/talk/base/signalthread.h',
- '<(libjingle_source)/talk/base/sigslot.h',
- '<(libjingle_source)/talk/base/sigslotrepeater.h',
- '<(libjingle_source)/talk/base/socket.h',
- '<(libjingle_source)/talk/base/socketadapters.cc',
- '<(libjingle_source)/talk/base/socketadapters.h',
- '<(libjingle_source)/talk/base/socketaddress.cc',
- '<(libjingle_source)/talk/base/socketaddress.h',
- '<(libjingle_source)/talk/base/socketaddresspair.cc',
- '<(libjingle_source)/talk/base/socketaddresspair.h',
- '<(libjingle_source)/talk/base/socketfactory.h',
- '<(libjingle_source)/talk/base/socketpool.cc',
- '<(libjingle_source)/talk/base/socketpool.h',
- '<(libjingle_source)/talk/base/socketserver.h',
- '<(libjingle_source)/talk/base/socketstream.cc',
- '<(libjingle_source)/talk/base/socketstream.h',
- '<(libjingle_source)/talk/base/ssladapter.cc',
- '<(libjingle_source)/talk/base/ssladapter.h',
- '<(libjingle_source)/talk/base/sslfingerprint.cc',
- '<(libjingle_source)/talk/base/sslfingerprint.h',
- '<(libjingle_source)/talk/base/sslidentity.cc',
- '<(libjingle_source)/talk/base/sslidentity.h',
- '<(libjingle_source)/talk/base/sslsocketfactory.cc',
- '<(libjingle_source)/talk/base/sslsocketfactory.h',
- '<(libjingle_source)/talk/base/sslstreamadapter.cc',
- '<(libjingle_source)/talk/base/sslstreamadapter.h',
- '<(libjingle_source)/talk/base/sslstreamadapterhelper.cc',
- '<(libjingle_source)/talk/base/sslstreamadapterhelper.h',
- '<(libjingle_source)/talk/base/stream.cc',
- '<(libjingle_source)/talk/base/stream.h',
- '<(libjingle_source)/talk/base/stringencode.cc',
- '<(libjingle_source)/talk/base/stringencode.h',
- '<(libjingle_source)/talk/base/stringutils.cc',
- '<(libjingle_source)/talk/base/stringutils.h',
- '<(libjingle_source)/talk/base/systeminfo.cc',
- '<(libjingle_source)/talk/base/systeminfo.h',
- '<(libjingle_source)/talk/base/task.cc',
- '<(libjingle_source)/talk/base/task.h',
- '<(libjingle_source)/talk/base/taskparent.cc',
- '<(libjingle_source)/talk/base/taskparent.h',
- '<(libjingle_source)/talk/base/taskrunner.cc',
- '<(libjingle_source)/talk/base/taskrunner.h',
- '<(libjingle_source)/talk/base/template_util.h',
- '<(libjingle_source)/talk/base/thread.cc',
- '<(libjingle_source)/talk/base/thread.h',
- '<(libjingle_source)/talk/base/timeutils.cc',
- '<(libjingle_source)/talk/base/timeutils.h',
- '<(libjingle_source)/talk/base/timing.cc',
- '<(libjingle_source)/talk/base/timing.h',
- '<(libjingle_source)/talk/base/urlencode.cc',
- '<(libjingle_source)/talk/base/urlencode.h',
- '<(libjingle_source)/talk/base/worker.cc',
- '<(libjingle_source)/talk/base/worker.h',
- '<(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/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/xmllite/qname.cc',
- '<(libjingle_source)/talk/xmllite/qname.h',
- '<(libjingle_source)/talk/xmllite/xmlbuilder.cc',
- '<(libjingle_source)/talk/xmllite/xmlbuilder.h',
- '<(libjingle_source)/talk/xmllite/xmlconstants.cc',
- '<(libjingle_source)/talk/xmllite/xmlconstants.h',
- '<(libjingle_source)/talk/xmllite/xmlelement.cc',
- '<(libjingle_source)/talk/xmllite/xmlelement.h',
- '<(libjingle_source)/talk/xmllite/xmlnsstack.cc',
- '<(libjingle_source)/talk/xmllite/xmlnsstack.h',
- '<(libjingle_source)/talk/xmllite/xmlparser.cc',
- '<(libjingle_source)/talk/xmllite/xmlparser.h',
- '<(libjingle_source)/talk/xmllite/xmlprinter.cc',
- '<(libjingle_source)/talk/xmllite/xmlprinter.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',
+ # Replaced with logging.cc in the overrides.
+ '<(libjingle_source)/talk/base/logging.h',
+ '<(libjingle_source)/talk/base/logging.cc',
],
'dependencies': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'libjingle_p2p_constants',
'<@(libjingle_additional_deps)',
],
- 'export_dependent_settings': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'sources': [
- 'overrides/talk/base/win32socketinit.cc',
- '<(libjingle_source)/talk/base/schanneladapter.cc',
- '<(libjingle_source)/talk/base/schanneladapter.h',
- '<(libjingle_source)/talk/base/win32.cc',
- '<(libjingle_source)/talk/base/win32.h',
- '<(libjingle_source)/talk/base/win32filesystem.cc',
- '<(libjingle_source)/talk/base/win32filesystem.h',
- '<(libjingle_source)/talk/base/win32window.h',
- '<(libjingle_source)/talk/base/win32window.cc',
- '<(libjingle_source)/talk/base/win32securityerrors.cc',
- '<(libjingle_source)/talk/base/winfirewall.cc',
- '<(libjingle_source)/talk/base/winfirewall.h',
- '<(libjingle_source)/talk/base/winping.cc',
- '<(libjingle_source)/talk/base/winping.h',
- ],
- # Suppress warnings about WIN32_LEAN_AND_MEAN.
- 'msvs_disabled_warnings': [ 4005, 4267 ],
- }],
- ['os_posix == 1', {
- 'sources': [
- '<(libjingle_source)/talk/base/unixfilesystem.cc',
- '<(libjingle_source)/talk/base/unixfilesystem.h',
- ],
- }],
- ['OS=="linux"', {
- 'sources': [
- '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
- '<(libjingle_source)/talk/base/latebindingsymboltable.h',
- '<(libjingle_source)/talk/base/linux.cc',
- '<(libjingle_source)/talk/base/linux.h',
- ],
- }],
- ['OS=="mac" or OS=="ios"', {
- 'sources': [
- '<(libjingle_source)/talk/base/macconversion.cc',
- '<(libjingle_source)/talk/base/macconversion.h',
- '<(libjingle_source)/talk/base/maccocoathreadhelper.h',
- '<(libjingle_source)/talk/base/maccocoathreadhelper.mm',
- '<(libjingle_source)/talk/base/macutils.cc',
- '<(libjingle_source)/talk/base/macutils.h',
- '<(libjingle_source)/talk/base/scoped_autorelease_pool.h',
- '<(libjingle_source)/talk/base/scoped_autorelease_pool.mm',
- ],
- }],
- ['OS=="android"', {
- 'sources': [
- '<(libjingle_source)/talk/base/ifaddrs-android.cc',
- '<(libjingle_source)/talk/base/ifaddrs-android.h',
- '<(libjingle_source)/talk/base/linux.cc',
- '<(libjingle_source)/talk/base/linux.h',
- ],
- 'sources!': [
- # These depend on jsoncpp which we don't load because we probably
- # don't actually need this code at all.
- '<(libjingle_source)/talk/base/json.cc',
- '<(libjingle_source)/talk/base/json.h',
- ],
- 'dependencies!': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
- ],
- }],
- ['use_openssl==1', {
- 'sources': [
- '<(libjingle_source)/talk/base/openssl.h',
- '<(libjingle_source)/talk/base/openssladapter.cc',
- '<(libjingle_source)/talk/base/openssldigest.cc',
- '<(libjingle_source)/talk/base/opensslidentity.cc',
- '<(libjingle_source)/talk/base/opensslstreamadapter.cc',
- ],
- }],
- ],
}, # target libjingle
# This has to be is a separate project due to a bug in MSVS 2008 and the
# current toolset on android. The problem is that we have two files named
« no previous file with comments | « no previous file | third_party/libjingle/libjingle_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698