media/cast/cast.gyp - Issue 102413014: Cast:Splitting rtcp sender

Unified Diff: media/cast/cast.gyp

Issue 102413014: Cast:Splitting rtcp sender (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: media/cast/cast.gyp

diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp

index 3aa57517c907660c4048da297e80d2317950cd5f..1f87a81618b6a1eab8e651af1c9efe44247e7626 100644

--- a/media/cast/cast.gyp

+++ b/media/cast/cast.gyp

@@ -4,6 +4,7 @@

{

'variables': {

+ 'include_tests%': 1,

'chromium_code': 1,

'targets': [

@@ -32,72 +33,73 @@

'logging/logging_stats.h',

], # source

- {

- 'target_name': 'cast_unittests',

- 'type': '<(gtest_target_type)',

- 'dependencies': [

- 'cast_config',

- 'cast_receiver.gyp:cast_receiver',

- 'cast_sender.gyp:cast_sender',

- 'test/utility/utility.gyp:cast_test_utility',

- '<(DEPTH)/base/base.gyp:run_all_unittests',

- '<(DEPTH)/base/base.gyp:test_support_base',

- '<(DEPTH)/crypto/crypto.gyp:crypto',

- '<(DEPTH)/net/net.gyp:net',

- '<(DEPTH)/testing/gmock.gyp:gmock',

- '<(DEPTH)/testing/gtest.gyp:gtest',

- ],

- 'include_dirs': [

- '<(DEPTH)/',

- '<(DEPTH)/third_party/',

- '<(DEPTH)/third_party/webrtc/',

- ],

- 'sources': [

- 'audio_receiver/audio_decoder_unittest.cc',

- 'audio_receiver/audio_receiver_unittest.cc',

- 'audio_sender/audio_encoder_unittest.cc',

- 'audio_sender/audio_sender_unittest.cc',

- 'congestion_control/congestion_control_unittest.cc',

- 'framer/cast_message_builder_unittest.cc',

- 'framer/frame_buffer_unittest.cc',

- 'framer/framer_unittest.cc',

- 'net/pacing/mock_paced_packet_sender.cc',

- 'net/pacing/mock_paced_packet_sender.h',

- 'net/pacing/paced_sender_unittest.cc',

- 'rtcp/mock_rtcp_receiver_feedback.cc',

- 'rtcp/mock_rtcp_receiver_feedback.h',

- 'rtcp/mock_rtcp_sender_feedback.cc',

- 'rtcp/mock_rtcp_sender_feedback.h',

- 'rtcp/rtcp_receiver_unittest.cc',

- 'rtcp/rtcp_sender_unittest.cc',

- 'rtcp/rtcp_unittest.cc',

- 'rtp_receiver/rtp_receiver_defines.h',

- 'rtp_receiver/mock_rtp_payload_feedback.cc',

- 'rtp_receiver/mock_rtp_payload_feedback.h',

- 'rtp_receiver/receiver_stats_unittest.cc',

- 'rtp_receiver/rtp_parser/test/rtp_packet_builder.cc',

- 'rtp_receiver/rtp_parser/rtp_parser_unittest.cc',

- 'net/rtp_sender/packet_storage/packet_storage_unittest.cc',

- 'net/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc',

- 'net/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc',

- 'net/rtp_sender/rtp_packetizer/test/rtp_header_parser.h',

- 'test/crypto_utility.cc',

- 'test/crypto_utility.h',

- 'test/encode_decode_test.cc',

- 'test/end2end_unittest.cc',

- 'video_receiver/video_decoder_unittest.cc',

- 'video_receiver/video_receiver_unittest.cc',

- 'video_sender/mock_video_encoder_controller.cc',

- 'video_sender/mock_video_encoder_controller.h',

- 'video_sender/video_encoder_unittest.cc',

- 'video_sender/video_sender_unittest.cc',

- ], # source

- },

], # targets,

'conditions': [

- ['OS == "linux"', {

+ ['include_tests==1', {

'targets': [

{

+ 'target_name': 'cast_unittests',

+ 'type': '<(gtest_target_type)',

+ 'dependencies': [

+ 'cast_config',

+ 'cast_receiver.gyp:cast_receiver',

+ 'cast_sender.gyp:cast_sender',

+ 'test/utility/utility.gyp:cast_test_utility',

+ '<(DEPTH)/base/base.gyp:run_all_unittests',

+ '<(DEPTH)/base/base.gyp:test_support_base',

+ '<(DEPTH)/crypto/crypto.gyp:crypto',

+ '<(DEPTH)/net/net.gyp:net',

+ '<(DEPTH)/testing/gmock.gyp:gmock',

+ '<(DEPTH)/testing/gtest.gyp:gtest',

+ ],

+ 'include_dirs': [

+ '<(DEPTH)/',

+ '<(DEPTH)/third_party/',

+ '<(DEPTH)/third_party/webrtc/',

+ ],

+ 'sources': [

+ 'audio_receiver/audio_decoder_unittest.cc',

+ 'audio_receiver/audio_receiver_unittest.cc',

+ 'audio_sender/audio_encoder_unittest.cc',

+ 'audio_sender/audio_sender_unittest.cc',

+ 'congestion_control/congestion_control_unittest.cc',

+ 'framer/cast_message_builder_unittest.cc',

+ 'framer/frame_buffer_unittest.cc',

+ 'framer/framer_unittest.cc',

+ 'net/pacing/mock_paced_packet_sender.cc',

+ 'net/pacing/mock_paced_packet_sender.h',

+ 'net/pacing/paced_sender_unittest.cc',

+ 'net/rtcp/rtcp_builder_unittest.cc',

+ 'rtcp/mock_rtcp_receiver_feedback.cc',

+ 'rtcp/mock_rtcp_receiver_feedback.h',

+ 'rtcp/mock_rtcp_sender_feedback.cc',

+ 'rtcp/mock_rtcp_sender_feedback.h',

+ 'rtcp/rtcp_receiver_unittest.cc',

+ 'rtcp/rtcp_sender_unittest.cc',

+ 'rtcp/rtcp_unittest.cc',

+ 'rtp_receiver/rtp_receiver_defines.h',

+ 'rtp_receiver/mock_rtp_payload_feedback.cc',

+ 'rtp_receiver/mock_rtp_payload_feedback.h',

+ 'rtp_receiver/receiver_stats_unittest.cc',

+ 'rtp_receiver/rtp_parser/test/rtp_packet_builder.cc',

+ 'rtp_receiver/rtp_parser/rtp_parser_unittest.cc',

+ 'net/rtp_sender/packet_storage/packet_storage_unittest.cc',

+ 'net/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc',

+ 'net/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc',

+ 'net/rtp_sender/rtp_packetizer/test/rtp_header_parser.h',

+ 'test/crypto_utility.cc',

+ 'test/crypto_utility.h',

+ 'test/encode_decode_test.cc',

+ 'test/end2end_unittest.cc',

+ 'video_receiver/video_decoder_unittest.cc',

+ 'video_receiver/video_receiver_unittest.cc',

+ 'video_sender/mock_video_encoder_controller.cc',

+ 'video_sender/mock_video_encoder_controller.h',

+ 'video_sender/video_encoder_unittest.cc',

+ 'video_sender/video_sender_unittest.cc',

+ ], # source

+ },

+ {

'target_name': 'cast_sender_app',

'type': 'executable',

'include_dirs': [

@@ -106,7 +108,6 @@

'dependencies': [

'cast_config',

'<(DEPTH)/ui/gfx/gfx.gyp:gfx',

- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',

'<(DEPTH)/net/net.gyp:net_test_support',

'<(DEPTH)/media/cast/cast_sender.gyp:*',

'<(DEPTH)/media/media.gyp:media',

@@ -128,7 +129,6 @@