kjellander 00984ff688 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 14:23:52 +00:00

150 lines
4.3 KiB
Python
Executable File

# Copyright (c) 2016 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'],
'variables': {
'rtc_pc_defines': [
'SRTP_RELATIVE_PATH',
'HAVE_SCTP',
'HAVE_SRTP',
],
},
'targets': [
{
'target_name': 'rtc_pc',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/media/media.gyp:rtc_media',
],
'conditions': [
['build_libsrtp==1', {
'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
],
}],
],
'defines': [
'<@(rtc_pc_defines)',
],
# TODO(kjellander): Make the code compile without disabling these flags.
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
'cflags_cc!': [
'-Wnon-virtual-dtor',
],
'include_dirs': [
'<(DEPTH)/testing/gtest/include',
],
'direct_dependent_settings': {
'defines': [
'<@(rtc_pc_defines)'
],
'include_dirs': [
'<(DEPTH)/testing/gtest/include',
],
},
'sources': [
'audiomonitor.cc',
'audiomonitor.h',
'bundlefilter.cc',
'bundlefilter.h',
'channel.cc',
'channel.h',
'channelmanager.cc',
'channelmanager.h',
'currentspeakermonitor.cc',
'currentspeakermonitor.h',
'mediamonitor.cc',
'mediamonitor.h',
'mediasession.cc',
'mediasession.h',
'mediasink.h',
'rtcpmuxfilter.cc',
'rtcpmuxfilter.h',
'srtpfilter.cc',
'srtpfilter.h',
'voicechannel.h',
],
}, # target rtc_pc
], # targets
'conditions': [
['include_tests==1', {
'targets' : [
{
'target_name': 'rtc_pc_unittests',
'type': 'executable',
'dependencies': [
'<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/media/media.gyp:rtc_unittest_main',
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
],
'include_dirs': [
'<(DEPTH)/third_party/libsrtp/srtp',
],
'sources': [
'bundlefilter_unittest.cc',
'channel_unittest.cc',
'channelmanager_unittest.cc',
'currentspeakermonitor_unittest.cc',
'mediasession_unittest.cc',
'rtcpmuxfilter_unittest.cc',
'srtpfilter_unittest.cc',
],
# TODO(kjellander): Make the code compile without disabling these flags.
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
'cflags_cc!': [
'-Wnon-virtual-dtor',
],
'conditions': [
['clang==0', {
'cflags': [
'-Wno-maybe-uninitialized', # Only exists for GCC.
],
}],
['build_libsrtp==1', {
'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
],
}],
['OS=="win"', {
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
'strmiids.lib',
],
},
},
}],
],
}, # target rtc_pc_unittests
], # targets
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'rtc_pc_unittests_run',
'type': 'none',
'dependencies': [
'rtc_pc_unittests',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'rtc_pc_unittests.isolate',
],
},
],
}],
], # conditions
}], # include_tests==1
], # conditions
}