2012-07-23 16:28:02 +00:00
|
|
|
# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
2011-05-30 11:51:34 +00:00
|
|
|
#
|
|
|
|
|
# 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.
|
|
|
|
|
{
|
2013-10-28 16:32:01 +00:00
|
|
|
'includes': [
|
|
|
|
|
'build/common.gypi',
|
2015-09-25 13:58:30 +02:00
|
|
|
'audio/webrtc_audio.gypi',
|
|
|
|
|
'call/webrtc_call.gypi',
|
2013-10-28 16:32:01 +00:00
|
|
|
'video/webrtc_video.gypi',
|
|
|
|
|
],
|
2011-09-14 17:02:44 +00:00
|
|
|
'targets': [
|
2013-10-28 16:32:01 +00:00
|
|
|
{
|
|
|
|
|
'target_name': 'webrtc',
|
|
|
|
|
'type': 'static_library',
|
|
|
|
|
'sources': [
|
|
|
|
|
'call.h',
|
2016-05-18 05:00:50 -07:00
|
|
|
'config.h',
|
Revert of Move webrtc/audio/audio_sink.h to webrtc/ and fix some dependencies. (patchset #2 id:40001 of https://codereview.webrtc.org/1737593002/ )
Reason for revert:
Breaks GN in chromium.
Original issue's description:
> Move webrtc/audio/audio_sink.h to webrtc/ and fix some dependencies.
>
> webrtc/audio/audio_sink.h is used by voice engine, but webrtc/audio is
> depending on voice engine, resulting in a cyclic dependency (which we
> don't detect since we have that check turned off, see webrtc:4243).
>
> BUG=webrtc:4243, webrtc:5589
> R=pbos@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org
> TBR=tommi@webrtc.org
>
> Committed: https://crrev.com/99b345c4e50c59a776c56949c17da3f50992f1a2
> Cr-Commit-Position: refs/heads/master@{#11766}
TBR=solenberg@webrtc.org,pbos@webrtc.org,perkj@webrtc.org,tommi@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4243, webrtc:5589
Review URL: https://codereview.webrtc.org/1739783002
Cr-Commit-Position: refs/heads/master@{#11769}
2016-02-25 08:36:42 -08:00
|
|
|
'transport.h',
|
|
|
|
|
'video_receive_stream.h',
|
|
|
|
|
'video_send_stream.h',
|
|
|
|
|
|
2015-09-25 13:58:30 +02:00
|
|
|
'<@(webrtc_audio_sources)',
|
|
|
|
|
'<@(webrtc_call_sources)',
|
2013-10-28 16:32:01 +00:00
|
|
|
'<@(webrtc_video_sources)',
|
|
|
|
|
],
|
|
|
|
|
'dependencies': [
|
2014-05-15 09:35:06 +00:00
|
|
|
'common.gyp:*',
|
2015-09-25 13:58:30 +02:00
|
|
|
'<@(webrtc_audio_dependencies)',
|
|
|
|
|
'<@(webrtc_call_dependencies)',
|
2013-10-28 16:32:01 +00:00
|
|
|
'<@(webrtc_video_dependencies)',
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'rtc_event_log_impl',
|
2013-10-28 16:32:01 +00:00
|
|
|
],
|
2014-09-18 08:58:15 +00:00
|
|
|
'conditions': [
|
2015-10-08 14:40:51 +02:00
|
|
|
# TODO(andresp): Chromium should link directly with this and no if
|
|
|
|
|
# conditions should be needed on webrtc build files.
|
2014-09-18 08:58:15 +00:00
|
|
|
['build_with_chromium==1', {
|
2014-12-15 16:33:16 +00:00
|
|
|
'dependencies': [
|
2015-02-11 07:47:00 +00:00
|
|
|
'<(webrtc_root)/modules/modules.gyp:video_capture',
|
2014-12-15 16:33:16 +00:00
|
|
|
],
|
|
|
|
|
}],
|
2014-09-18 08:58:15 +00:00
|
|
|
],
|
2013-10-28 16:32:01 +00:00
|
|
|
},
|
2015-07-30 12:45:18 +02:00
|
|
|
{
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'target_name': 'rtc_event_log_api',
|
2015-07-30 12:45:18 +02:00
|
|
|
'type': 'static_library',
|
|
|
|
|
'sources': [
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'logging/rtc_event_log/rtc_event_log.h',
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'target_name': 'rtc_event_log_impl',
|
|
|
|
|
'type': 'static_library',
|
|
|
|
|
'sources': [
|
|
|
|
|
'logging/rtc_event_log/ringbuffer.h',
|
|
|
|
|
'logging/rtc_event_log/rtc_event_log.cc',
|
|
|
|
|
'logging/rtc_event_log/rtc_event_log_helper_thread.cc',
|
|
|
|
|
'logging/rtc_event_log/rtc_event_log_helper_thread.h',
|
2015-07-30 12:45:18 +02:00
|
|
|
],
|
|
|
|
|
'conditions': [
|
|
|
|
|
# If enable_protobuf is defined, we want to compile the protobuf
|
|
|
|
|
# and add rtc_event_log.pb.h and rtc_event_log.pb.cc to the sources.
|
|
|
|
|
['enable_protobuf==1', {
|
|
|
|
|
'dependencies': [
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'rtc_event_log_api',
|
2015-07-30 12:45:18 +02:00
|
|
|
'rtc_event_log_proto',
|
2016-10-25 11:19:07 -07:00
|
|
|
'<(webrtc_root)/api/api.gyp:call_api',
|
2015-07-30 12:45:18 +02:00
|
|
|
],
|
|
|
|
|
'defines': [
|
|
|
|
|
'ENABLE_RTC_EVENT_LOG',
|
|
|
|
|
],
|
|
|
|
|
}],
|
|
|
|
|
],
|
|
|
|
|
},
|
2016-06-14 02:09:19 -07:00
|
|
|
], # targets
|
|
|
|
|
'conditions': [
|
|
|
|
|
['include_tests==1', {
|
|
|
|
|
'includes': [
|
|
|
|
|
'webrtc_tests.gypi',
|
|
|
|
|
],
|
|
|
|
|
}],
|
|
|
|
|
['enable_protobuf==1', {
|
|
|
|
|
'targets': [
|
|
|
|
|
{
|
|
|
|
|
# This target should only be built if enable_protobuf is defined
|
|
|
|
|
'target_name': 'rtc_event_log_proto',
|
|
|
|
|
'type': 'static_library',
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'sources': ['logging/rtc_event_log/rtc_event_log.proto',],
|
2016-06-14 02:09:19 -07:00
|
|
|
'variables': {
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'proto_in_dir': 'logging/rtc_event_log',
|
|
|
|
|
'proto_out_dir': 'webrtc/logging/rtc_event_log',
|
2016-06-14 02:09:19 -07:00
|
|
|
},
|
|
|
|
|
'includes': ['build/protoc.gypi'],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'target_name': 'rtc_event_log_parser',
|
|
|
|
|
'type': 'static_library',
|
|
|
|
|
'sources': [
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'logging/rtc_event_log/rtc_event_log_parser.cc',
|
|
|
|
|
'logging/rtc_event_log/rtc_event_log_parser.h',
|
2016-06-14 02:09:19 -07:00
|
|
|
],
|
|
|
|
|
'dependencies': [
|
|
|
|
|
'rtc_event_log_proto',
|
|
|
|
|
],
|
|
|
|
|
'export_dependent_settings': [
|
|
|
|
|
'rtc_event_log_proto',
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
}],
|
|
|
|
|
['include_tests==1 and enable_protobuf==1', {
|
|
|
|
|
'targets': [
|
|
|
|
|
{
|
|
|
|
|
'target_name': 'rtc_event_log2rtp_dump',
|
|
|
|
|
'type': 'executable',
|
Moved RtcEventLog files from call/ to logging/
The RtcEventLog headers need to be accessible from any place which needs
logging, and the implementation needs access to data structures that are
logged.
After a discussion in the code review, we all agreed to move the RtcEventLog implementation into its own top level directory - which I called "logging/" in expectation that other types of logging may have similar requirements. The directory contains two main build targets - "rtc_event_log_api", which is just rtc_event_log.h, that has no external dependencies and can be used from anywhere, and "rtc_event_log_impl" which contains the rest of the implementation and has many dependencies (more in the future).
The "api" target can be referenced from anywhere, while the "impl" target is only needed at the place of instantiation (currently Call, soon to be moved to PeerConnection by https://codereview.webrtc.org/2353033005/).
This change allows using RtcEventLog in the p2p/ directory, so that we
can log STUN pings and ICE state transitions.
BUG=webrtc:6393
R=kjellander@webrtc.org, kwiberg@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org
Review URL: https://codereview.webrtc.org/2380683005 .
Cr-Commit-Position: refs/heads/master@{#14485}
2016-10-03 18:31:22 -07:00
|
|
|
'sources': ['logging/rtc_event_log2rtp_dump.cc',],
|
2016-06-14 02:09:19 -07:00
|
|
|
'dependencies': [
|
|
|
|
|
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
|
|
|
|
|
'rtc_event_log_parser',
|
|
|
|
|
'rtc_event_log_proto',
|
|
|
|
|
'test/test.gyp:rtp_test_utils'
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
}],
|
|
|
|
|
], # conditions
|
2011-05-30 11:51:34 +00:00
|
|
|
}
|