7bc7c06e6a
Reason for revert: Breaks downstream for SRTP include paths. Will rework this and reland without that one. Original issue's description: > Remove the rtc_relative_path GYP variable and similar defines > > The defines that can be used to alter the include paths for Expat, SRTP > and gtest are no longer needed in WebRTC or Chromium. Let's remove them > to simplify the GYP a little. > > Removed defines: > EXPAT_RELATIVE_PATH > GTEST_RELATIVE_PATH > SRTP_RELATIVE_PATH > > They're all set in the Chromium build so this shouldn't affect Chromium: > https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjingle/libjingle.gyp > > BUG=webrtc:4256 > NOTRY=True > NOPRESUBMIT=True > > Committed: https://crrev.com/e19cf59eb6ee44fd4d7e7fbcfdd1a6ea75063605 > Cr-Commit-Position: refs/heads/master@{#12467} TBR=pthatcher@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1913043003 Cr-Commit-Position: refs/heads/master@{#12468}
150 lines
4.3 KiB
Python
Executable File
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
|
|
}
|