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}
176 lines
4.9 KiB
Python
176 lines
4.9 KiB
Python
# 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_xmpp',
|
|
'type': 'static_library',
|
|
'dependencies': [
|
|
'<(webrtc_root)/base/base.gyp:rtc_base',
|
|
'<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
|
|
],
|
|
'defines': [
|
|
'FEATURE_ENABLE_SSL',
|
|
],
|
|
'cflags_cc!': [
|
|
'-Wnon-virtual-dtor',
|
|
],
|
|
'sources': [
|
|
'asyncsocket.h',
|
|
'chatroommodule.h',
|
|
'chatroommoduleimpl.cc',
|
|
'constants.cc',
|
|
'constants.h',
|
|
'discoitemsquerytask.cc',
|
|
'discoitemsquerytask.h',
|
|
'hangoutpubsubclient.cc',
|
|
'hangoutpubsubclient.h',
|
|
'iqtask.cc',
|
|
'iqtask.h',
|
|
'jid.cc',
|
|
'jid.h',
|
|
'module.h',
|
|
'moduleimpl.cc',
|
|
'moduleimpl.h',
|
|
'mucroomconfigtask.cc',
|
|
'mucroomconfigtask.h',
|
|
'mucroomdiscoverytask.cc',
|
|
'mucroomdiscoverytask.h',
|
|
'mucroomlookuptask.cc',
|
|
'mucroomlookuptask.h',
|
|
'mucroomuniquehangoutidtask.cc',
|
|
'mucroomuniquehangoutidtask.h',
|
|
'pingtask.cc',
|
|
'pingtask.h',
|
|
'plainsaslhandler.h',
|
|
'presenceouttask.cc',
|
|
'presenceouttask.h',
|
|
'presencereceivetask.cc',
|
|
'presencereceivetask.h',
|
|
'presencestatus.cc',
|
|
'presencestatus.h',
|
|
'prexmppauth.h',
|
|
'pubsub_task.cc',
|
|
'pubsub_task.h',
|
|
'pubsubclient.cc',
|
|
'pubsubclient.h',
|
|
'pubsubstateclient.cc',
|
|
'pubsubstateclient.h',
|
|
'pubsubtasks.cc',
|
|
'pubsubtasks.h',
|
|
'receivetask.cc',
|
|
'receivetask.h',
|
|
'rostermodule.h',
|
|
'rostermoduleimpl.cc',
|
|
'rostermoduleimpl.h',
|
|
'saslcookiemechanism.h',
|
|
'saslhandler.h',
|
|
'saslmechanism.cc',
|
|
'saslmechanism.h',
|
|
'saslplainmechanism.h',
|
|
'xmppauth.cc',
|
|
'xmppauth.h',
|
|
'xmppclient.cc',
|
|
'xmppclient.h',
|
|
'xmppclientsettings.h',
|
|
'xmppengine.h',
|
|
'xmppengineimpl.cc',
|
|
'xmppengineimpl.h',
|
|
'xmppengineimpl_iq.cc',
|
|
'xmpplogintask.cc',
|
|
'xmpplogintask.h',
|
|
'xmpppump.cc',
|
|
'xmpppump.h',
|
|
'xmppsocket.cc',
|
|
'xmppsocket.h',
|
|
'xmppstanzaparser.cc',
|
|
'xmppstanzaparser.h',
|
|
'xmpptask.cc',
|
|
'xmpptask.h',
|
|
'xmppthread.cc',
|
|
'xmppthread.h',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'cflags_cc!': [
|
|
'-Wnon-virtual-dtor',
|
|
],
|
|
'defines': [
|
|
'FEATURE_ENABLE_SSL',
|
|
'FEATURE_ENABLE_VOICEMAIL',
|
|
],
|
|
},
|
|
'conditions': [
|
|
['build_expat==1', {
|
|
'dependencies': [
|
|
'<(DEPTH)/third_party/expat/expat.gyp:expat',
|
|
],
|
|
'export_dependent_settings': [
|
|
'<(DEPTH)/third_party/expat/expat.gyp:expat',
|
|
],
|
|
}],
|
|
['build_with_chromium==0', {
|
|
'defines': [
|
|
'FEATURE_ENABLE_VOICEMAIL',
|
|
'FEATURE_ENABLE_PSTN',
|
|
],
|
|
}],
|
|
['os_posix==1', {
|
|
'configurations': {
|
|
'Debug_Base': {
|
|
'defines': [
|
|
# Chromium's build/common.gypi defines this for all posix
|
|
# _except_ for ios & mac. We want it there as well, e.g.
|
|
# because ASSERT and friends trigger off of it.
|
|
'_DEBUG',
|
|
],
|
|
},
|
|
}
|
|
}],
|
|
['OS=="android"', {
|
|
'cflags!': [
|
|
'-Wextra',
|
|
'-Wall',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
], # targets
|
|
'conditions': [
|
|
['include_tests==1', {
|
|
'targets' : [
|
|
{
|
|
'target_name': 'rtc_xmpp_unittest',
|
|
'type': 'none',
|
|
'direct_dependent_settings': {
|
|
'sources': [
|
|
'fakexmppclient.h',
|
|
'hangoutpubsubclient_unittest.cc',
|
|
'jid_unittest.cc',
|
|
'mucroomconfigtask_unittest.cc',
|
|
'mucroomdiscoverytask_unittest.cc',
|
|
'mucroomlookuptask_unittest.cc',
|
|
'mucroomuniquehangoutidtask_unittest.cc',
|
|
'pingtask_unittest.cc',
|
|
'pubsubclient_unittest.cc',
|
|
'pubsubtasks_unittest.cc',
|
|
'util_unittest.cc',
|
|
'util_unittest.h',
|
|
'xmppengine_unittest.cc',
|
|
'xmpplogintask_unittest.cc',
|
|
'xmppstanzaparser_unittest.cc',
|
|
],
|
|
},
|
|
}, # target rtc_xmpp_unittest
|
|
], # targets
|
|
}], # include_tests==1
|
|
], # conditions
|
|
}
|
|
|