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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 12465002: Refactor libjingle.gyp: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 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 | « remoting/remoting.gyp ('k') | no next file » | 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 9d707e09d65d63b921305c1b85abeed8b855197d..bcf0b53404b7be9f0c3877f0bdb54d2e31911f58 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -8,8 +8,9 @@
],
'variables': {
'enabled_libjingle_device_manager%': 0,
- 'libjingle_source%': "source",
'libjingle_peerconnection_additional_deps%': [],
+ 'libjingle_source%': "source",
+ 'libpeer_target_type%': 'static_library',
},
'target_defaults': {
'defines': [
@@ -85,7 +86,7 @@
'../third_party/platformsdk_win7/files/Include',
],
'defines': [
- '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf
+ '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267 ],
@@ -139,6 +140,9 @@
},
},
'conditions': [
+ ['"<(libpeer_target_type)"=="static_library"', {
+ 'defines': [ 'LIBPEER_LIB=1' ],
+ }],
['use_openssl==1', {
'defines': [
'SSL_USE_OPENSSL',
@@ -286,8 +290,8 @@
'<(libjingle_source)/talk/base/host.h',
'<(libjingle_source)/talk/base/httpbase.cc',
'<(libjingle_source)/talk/base/httpbase.h',
- '<(libjingle_source)/talk/base/httpclient.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',
@@ -311,11 +315,11 @@
'<(libjingle_source)/talk/base/nethelpers.h',
'<(libjingle_source)/talk/base/network.cc',
'<(libjingle_source)/talk/base/network.h',
- '<(libjingle_source)/talk/base/nullsocketserver.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',
@@ -382,6 +386,70 @@
'<(libjingle_source)/talk/base/urlencode.h',
'<(libjingle_source)/talk/base/worker.cc',
'<(libjingle_source)/talk/base/worker.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/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',
@@ -424,6 +492,7 @@
],
'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+ 'libjingle_p2p_constants',
],
'export_dependent_settings': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
@@ -500,89 +569,21 @@
}],
],
}, # target libjingle
- # This has to be is a separate project due to a bug in MSVS:
- # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplicate-cpp-filename-in-c-project-visual-studio-2008
- # We have two files named "constants.cc" and MSVS doesn't handle this
- # properly.
+ # 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
+ # "constants.cc" and MSVS/android doesn't handle this properly.
+ # GYP currently has guards to catch this, so if you want to remove it,
+ # run GYP and if GYP has removed the validation check, then we can assume
+ # that the toolchains have been fixed (we currently use VS2010 and later,
+ # so VS2008 isn't a concern anymore).
{
- 'target_name': 'libjingle_p2p',
+ 'target_name': 'libjingle_p2p_constants',
'type': 'static_library',
'sources': [
- '<(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/port.cc',
- '<(libjingle_source)/talk/p2p/base/port.h',
- '<(libjingle_source)/talk/p2p/base/portallocator.h',
- '<(libjingle_source)/talk/p2p/base/portallocator.cc',
- '<(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/parsing.cc',
- '<(libjingle_source)/talk/p2p/base/parsing.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/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/session/tunnel/pseudotcpchannel.cc',
- '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
- '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
- '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
],
- 'dependencies': [
- 'libjingle',
- ],
- }, # target libjingle_p2p
+ }, # target libjingle_p2p_constants
{
'target_name': 'peerconnection_server',
'type': 'executable',
@@ -609,8 +610,15 @@
['enable_webrtc==1', {
'targets': [
{
- 'target_name': 'libjingle_peerconnection',
- 'type': 'static_library',
+ 'target_name': 'libpeerconnection',
+ 'type': '<(libpeer_target_type)',
+ 'all_dependent_settings': {
+ 'conditions': [
+ ['"<(libpeer_target_type)"=="static_library"', {
+ 'defines': [ 'LIBPEER_LIB=1' ],
Sergey Ulanov 2013/03/05 22:12:03 I think since you renamed the target, it's better
tommi (sloooow) - chröme 2013/03/05 22:45:53 Done. I'm having problems with git cl upload thou
+ }],
+ ],
+ },
'sources': [
'<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
'<(libjingle_source)/talk/app/webrtc/audiotrack.h',
@@ -647,17 +655,17 @@
'<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h',
'<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc',
'<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h',
- '<(libjingle_source)/talk/app/webrtc/statscollector.h',
'<(libjingle_source)/talk/app/webrtc/statscollector.cc',
+ '<(libjingle_source)/talk/app/webrtc/statscollector.h',
'<(libjingle_source)/talk/app/webrtc/statstypes.h',
'<(libjingle_source)/talk/app/webrtc/streamcollection.h',
'<(libjingle_source)/talk/app/webrtc/videosourceinterface.h',
- '<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
'<(libjingle_source)/talk/app/webrtc/videosourceproxy.cc',
- '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.cc',
- '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.h',
+ '<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
'<(libjingle_source)/talk/app/webrtc/videotrack.cc',
'<(libjingle_source)/talk/app/webrtc/videotrack.h',
+ '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.cc',
+ '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.h',
'<(libjingle_source)/talk/app/webrtc/webrtcsdp.cc',
'<(libjingle_source)/talk/app/webrtc/webrtcsdp.h',
'<(libjingle_source)/talk/app/webrtc/webrtcsession.cc',
@@ -694,6 +702,7 @@
'<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
'<(libjingle_source)/talk/media/devices/filevideocapturer.cc',
'<(libjingle_source)/talk/media/devices/filevideocapturer.h',
+ '<(libjingle_source)/talk/media/webrtc/webrtccommon.h',
'<(libjingle_source)/talk/media/webrtc/webrtcpassthroughrender.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcvideocapturer.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcvideocapturer.h',
@@ -705,7 +714,6 @@
'<(libjingle_source)/talk/media/webrtc/webrtcvoe.h',
'<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
'<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
- '<(libjingle_source)/talk/media/webrtc/webrtccommon.h',
'<(libjingle_source)/talk/session/media/audiomonitor.cc',
'<(libjingle_source)/talk/session/media/audiomonitor.h',
'<(libjingle_source)/talk/session/media/call.cc',
@@ -733,11 +741,28 @@
'<(libjingle_source)/talk/session/media/srtpfilter.h',
'<(libjingle_source)/talk/session/media/ssrcmuxfilter.cc',
'<(libjingle_source)/talk/session/media/ssrcmuxfilter.h',
- '<(libjingle_source)/talk/session/media/typingmonitor.h',
'<(libjingle_source)/talk/session/media/typingmonitor.cc',
+ '<(libjingle_source)/talk/session/media/typingmonitor.h',
'<(libjingle_source)/talk/session/media/voicechannel.h',
+ '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc',
+ '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
+ '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
+ '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
],
'conditions': [
+ ['"<(libpeer_target_type)"=="shared_library"', {
+ # Used to control symbol export/import.
+ 'defines': [ 'LIBPEERCONNECTION_IMPLEMENTATION=1' ],
+ }],
+ ['OS=="win" and "<(libpeer_target_type)"=="shared_library"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lsecur32.lib',
+ '-lcrypt32.lib',
+ '-liphlpapi.lib',
+ ],
+ },
+ }],
['enabled_libjingle_device_manager==1', {
'sources!': [
'<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
@@ -816,14 +841,13 @@
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
+ '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
- '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<@(libjingle_peerconnection_additional_deps)',
'libjingle',
- 'libjingle_p2p',
],
- }, # target libjingle_peerconnection
+ }, # target libpeerconnection
],
}],
],
« no previous file with comments | « remoting/remoting.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698