2014-10-28 22:20:11 +00:00
|
|
|
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
|
|
|
#
|
|
|
|
|
# Use of this source code is governed by a BSD-style license
|
|
|
|
|
# that can be found in the LICENSE file in the root of the source
|
|
|
|
|
# tree. An additional intellectual property rights grant can be found
|
|
|
|
|
# in the file PATENTS. All contributing project authors may
|
|
|
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
'includes': [ '../build/common.gypi', ],
|
|
|
|
|
'targets': [
|
|
|
|
|
{
|
|
|
|
|
'target_name': 'rtc_p2p',
|
|
|
|
|
'type': 'static_library',
|
|
|
|
|
'dependencies': [
|
2015-01-26 19:17:26 +00:00
|
|
|
'<(webrtc_root)/base/base.gyp:rtc_base',
|
2015-02-26 13:59:22 +00:00
|
|
|
'<(webrtc_root)/common.gyp:webrtc_common',
|
2014-10-28 22:20:11 +00:00
|
|
|
],
|
|
|
|
|
'sources': [
|
|
|
|
|
'base/asyncstuntcpsocket.cc',
|
|
|
|
|
'base/asyncstuntcpsocket.h',
|
|
|
|
|
'base/basicpacketsocketfactory.cc',
|
|
|
|
|
'base/basicpacketsocketfactory.h',
|
|
|
|
|
'base/candidate.h',
|
|
|
|
|
'base/common.h',
|
2016-06-18 04:23:01 -07:00
|
|
|
'base/dtlstransport.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'base/dtlstransportchannel.cc',
|
|
|
|
|
'base/dtlstransportchannel.h',
|
2016-03-02 05:42:30 -08:00
|
|
|
'base/p2pconstants.cc',
|
|
|
|
|
'base/p2pconstants.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'base/p2ptransport.cc',
|
|
|
|
|
'base/p2ptransport.h',
|
|
|
|
|
'base/p2ptransportchannel.cc',
|
|
|
|
|
'base/p2ptransportchannel.h',
|
2016-10-18 15:38:38 -07:00
|
|
|
'base/packettransportinterface.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'base/packetsocketfactory.h',
|
|
|
|
|
'base/port.cc',
|
|
|
|
|
'base/port.h',
|
|
|
|
|
'base/portallocator.cc',
|
|
|
|
|
'base/portallocator.h',
|
|
|
|
|
'base/portinterface.h',
|
2014-12-13 01:56:39 +00:00
|
|
|
'base/pseudotcp.cc',
|
|
|
|
|
'base/pseudotcp.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'base/relayport.cc',
|
|
|
|
|
'base/relayport.h',
|
2016-06-18 04:23:01 -07:00
|
|
|
'base/session.cc',
|
|
|
|
|
'base/session.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'base/sessiondescription.cc',
|
|
|
|
|
'base/sessiondescription.h',
|
|
|
|
|
'base/stun.cc',
|
|
|
|
|
'base/stun.h',
|
|
|
|
|
'base/stunport.cc',
|
|
|
|
|
'base/stunport.h',
|
|
|
|
|
'base/stunrequest.cc',
|
|
|
|
|
'base/stunrequest.h',
|
|
|
|
|
'base/tcpport.cc',
|
|
|
|
|
'base/tcpport.h',
|
|
|
|
|
'base/transport.cc',
|
|
|
|
|
'base/transport.h',
|
|
|
|
|
'base/transportchannel.cc',
|
|
|
|
|
'base/transportchannel.h',
|
|
|
|
|
'base/transportchannelimpl.h',
|
2015-09-23 11:50:27 -07:00
|
|
|
'base/transportcontroller.cc',
|
|
|
|
|
'base/transportcontroller.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'base/transportdescription.cc',
|
|
|
|
|
'base/transportdescription.h',
|
|
|
|
|
'base/transportdescriptionfactory.cc',
|
|
|
|
|
'base/transportdescriptionfactory.h',
|
|
|
|
|
'base/transportinfo.h',
|
|
|
|
|
'base/turnport.cc',
|
|
|
|
|
'base/turnport.h',
|
|
|
|
|
'base/udpport.h',
|
2016-11-09 13:44:09 -08:00
|
|
|
'base/udptransportchannel.cc',
|
|
|
|
|
'base/udptransportchannel.h',
|
2014-10-28 22:20:11 +00:00
|
|
|
'client/basicportallocator.cc',
|
|
|
|
|
'client/basicportallocator.h',
|
|
|
|
|
'client/socketmonitor.cc',
|
|
|
|
|
'client/socketmonitor.h',
|
|
|
|
|
],
|
|
|
|
|
'direct_dependent_settings': {
|
|
|
|
|
'defines': [
|
|
|
|
|
'FEATURE_ENABLE_VOICEMAIL',
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
'conditions': [
|
|
|
|
|
['build_with_chromium==0', {
|
2016-06-18 04:23:01 -07:00
|
|
|
'sources': [
|
|
|
|
|
'base/relayserver.cc',
|
|
|
|
|
'base/relayserver.h',
|
|
|
|
|
'base/stunserver.cc',
|
|
|
|
|
'base/stunserver.h',
|
|
|
|
|
'base/turnserver.cc',
|
|
|
|
|
'base/turnserver.h',
|
|
|
|
|
],
|
2014-10-28 22:20:11 +00:00
|
|
|
'defines': [
|
|
|
|
|
'FEATURE_ENABLE_VOICEMAIL',
|
|
|
|
|
'FEATURE_ENABLE_PSTN',
|
|
|
|
|
],
|
|
|
|
|
}],
|
2016-02-08 17:35:47 -08:00
|
|
|
['use_quic==1', {
|
|
|
|
|
'dependencies': [
|
|
|
|
|
'<(DEPTH)/third_party/libquic/libquic.gyp:libquic',
|
|
|
|
|
],
|
|
|
|
|
'sources': [
|
|
|
|
|
'quic/quicconnectionhelper.cc',
|
|
|
|
|
'quic/quicconnectionhelper.h',
|
|
|
|
|
'quic/quicsession.cc',
|
|
|
|
|
'quic/quicsession.h',
|
2016-04-29 20:20:54 -07:00
|
|
|
'quic/quictransport.cc',
|
|
|
|
|
'quic/quictransport.h',
|
2016-03-04 09:55:02 -08:00
|
|
|
'quic/quictransportchannel.cc',
|
|
|
|
|
'quic/quictransportchannel.h',
|
2016-02-08 17:35:47 -08:00
|
|
|
'quic/reliablequicstream.cc',
|
|
|
|
|
'quic/reliablequicstream.h',
|
|
|
|
|
],
|
|
|
|
|
'export_dependent_settings': [
|
|
|
|
|
'<(DEPTH)/third_party/libquic/libquic.gyp:libquic',
|
|
|
|
|
],
|
|
|
|
|
}],
|
2014-10-28 22:20:11 +00:00
|
|
|
],
|
2015-05-15 10:26:52 -07:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'target_name': 'libstunprober',
|
|
|
|
|
'type': 'static_library',
|
|
|
|
|
'dependencies': [
|
|
|
|
|
'<(webrtc_root)/base/base.gyp:rtc_base',
|
|
|
|
|
'<(webrtc_root)/common.gyp:webrtc_common',
|
|
|
|
|
],
|
|
|
|
|
'sources': [
|
|
|
|
|
'stunprober/stunprober.cc',
|
|
|
|
|
],
|
|
|
|
|
},
|
Reland of move {media,p2p,pc,xmllite,xmpp}_tests.gypi files. (patchset #1 id:1 of https://codereview.webrtc.org/1846693002/ )
The re-land moves the isolate build targets for media.gyp
and pc.gyp into the include_tests==1 condition.
This has been tested in a Chromium checkout and no longer
causes the error that was seen after landing
https://codereview.webrtc.org/1839763004/
Original issue's description:
> Revert of Remove {media,p2p,pc,xmllite,xmpp}_tests.gypi files. (patchset #1 id:1 of https://codereview.webrtc.org/1839763004/ )
>
> Reason for revert:
> Breaks Chromium: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11313/steps/gclient%20runhooks/logs/stdio:
>
> Updating projects from gyp files...
> Using overrides found in /Users/chrome-bot/.gyp/include.gypi
> Traceback (most recent call last):
> File "src/build/gyp_chromium", line 12, in <module>
> execfile(__file__ + '.py')
> File "src/build/gyp_chromium.py", line 341, in <module>
> sys.exit(main())
> File "src/build/gyp_chromium.py", line 328, in main
> gyp_rc = gyp.main(args)
> File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/__init__.py", line 538, in main
> return gyp_main(args)
> File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/__init__.py", line 514, in gyp_main
> options.duplicate_basename_check)
> File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/__init__.py", line 130, in Load
> params['parallel'], params['root_targets'])
> File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/input.py", line 2800, in Load
> RemoveLinkDependenciesFromNoneTargets(targets)
> File "/b/build/slave/Mac_Builder/build/src/tools/gyp/pylib/gyp/input.py", line 1510, in RemoveLinkDependenciesFromNoneTargets
> if targets[t].get('variables', {}).get('link_dependency', 0):
> KeyError: '/b/build/slave/Mac_Builder/build/src/third_party/webrtc/media/media.gyp:rtc_media_unittests#target'
> Error: Command '/usr/bin/python src/build/gyp_chromium' returned non-zero exit status 1 in /b/build/slave/Mac_Builder/build
> Hook '/usr/bin/python src/build/gyp_chromium' took 20.29 secs
>
> Original issue's description:
> > Remove {media,p2p,pc,xmllite,xmpp}_tests.gypi files.
> >
> > These contributes to circular dependency problems in WebRTC
> > since one have to depend on webrtc.gyp in order to depend on
> > a target in them.
> >
> > This reduces the number of cyclic dependencies in WebRTC from 21
> > to 16.
> >
> > BUG=webrtc:4243
> > NOTRY=True
> > NOPRESUBMIT=True
> >
> > Committed: https://crrev.com/231b69f28dd22f4e2d98e5048f8eaae7b20915e6
> > Cr-Commit-Position: refs/heads/master@{#12166}
>
> TBR=pthatcher@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4243
>
> Committed: https://crrev.com/72644d2cf6b14bbc4a107f79158eaa225f3196b5
> Cr-Commit-Position: refs/heads/master@{#12167}
TBR=pthatcher@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4243
Review URL: https://codereview.webrtc.org/1843193002
Cr-Commit-Position: refs/heads/master@{#12180}
2016-03-31 07:23:49 -07:00
|
|
|
], # targets
|
2014-10-28 22:20:11 +00:00
|
|
|
}
|
2015-01-26 19:17:26 +00:00
|
|
|
|