Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1084)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/cast.gyp

Issue 248083005: Reland: [Cast] Consolidate plethora of GYP files into cast.gyp and cast_testing.gypi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes to problems exposed by r265481. Created 6 years, 8 months 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
Download patch
« no previous file with comments | « media/cast/audio_sender/audio_sender.gypi ('k') | media/cast/cast_config.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/cast.gyp
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index f0a77f2cc414274a7e97ae309d921ed58c94dcbd..b50c5ee476eaf09cb2d04e8a494bc8c16f721627 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -7,144 +7,223 @@
'include_tests%': 1,
'chromium_code': 1,
},
- 'targets': [
- ], # targets,
'conditions': [
['include_tests==1', {
- 'targets': [
- {
- 'target_name': 'cast_unittests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- 'cast_config.gyp:cast_config',
- 'cast_receiver.gyp:cast_receiver',
- 'cast_sender.gyp:cast_sender',
- 'logging/logging.gyp:cast_log_analysis',
- 'logging/logging.gyp:cast_logging_proto_lib',
- 'logging/logging.gyp:sender_logging',
- 'test/utility/utility.gyp:cast_test_utility',
- 'transport/cast_transport.gyp:cast_transport',
- '<(DEPTH)/base/base.gyp:test_support_base',
- '<(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': [
- '<(DEPTH)/media/base/run_all_unittests.cc',
- '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',
- 'logging/encoding_event_subscriber_unittest.cc',
- 'logging/serialize_deserialize_test.cc',
- 'logging/logging_impl_unittest.cc',
- 'logging/logging_raw_unittest.cc',
- 'logging/simple_event_subscriber_unittest.cc',
- 'logging/stats_event_subscriber_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',
- 'rtcp/receiver_rtcp_event_subscriber_unittest.cc',
- 'rtcp/sender_rtcp_event_subscriber_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',
- 'test/end2end_unittest.cc',
- 'test/fake_single_thread_task_runner.cc',
- 'test/fake_single_thread_task_runner.h',
- 'test/fake_video_encode_accelerator.cc',
- 'test/fake_video_encode_accelerator.h',
- 'test/utility/audio_utility_unittest.cc',
- 'test/utility/barcode_unittest.cc',
- 'transport/cast_transport_sender_impl_unittest.cc',
- 'transport/pacing/mock_paced_packet_sender.cc',
- 'transport/pacing/mock_paced_packet_sender.h',
- 'transport/pacing/paced_sender_unittest.cc',
- 'transport/rtp_sender/packet_storage/packet_storage_unittest.cc',
- 'transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc',
- 'transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc',
- 'transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.h',
- 'transport/transport/udp_transport_unittest.cc',
- 'video_receiver/video_decoder_unittest.cc',
- 'video_receiver/video_receiver_unittest.cc',
- 'video_sender/external_video_encoder_unittest.cc',
- 'video_sender/video_encoder_impl_unittest.cc',
- 'video_sender/video_sender_unittest.cc',
- ], # source
- },
- {
- 'target_name': 'cast_sender_app',
- 'type': 'executable',
- 'include_dirs': [
- '<(DEPTH)/',
- ],
- 'dependencies': [
- 'cast_config.gyp:cast_config',
- 'logging/logging.gyp:sender_logging',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
- '<(DEPTH)/net/net.gyp:net_test_support',
- '<(DEPTH)/media/cast/cast_sender.gyp:*',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- '<(DEPTH)/third_party/opus/opus.gyp:opus',
- '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
- '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
- ],
- 'sources': [
- '<(DEPTH)/media/cast/test/sender.cc',
- ],
- },
- {
- 'target_name': 'cast_receiver_app',
- 'type': 'executable',
- 'include_dirs': [
- '<(DEPTH)/',
- ],
- 'dependencies': [
- 'cast_config.gyp:cast_config',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
- '<(DEPTH)/net/net.gyp:net_test_support',
- '<(DEPTH)/media/cast/cast_receiver.gyp:*',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
- '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
- '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
- ],
- 'sources': [
- '<(DEPTH)/media/cast/test/receiver.cc',
- ],
- 'conditions': [
- ['OS == "linux" and use_x11==1', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:x11',
- '<(DEPTH)/build/linux/system.gyp:xext',
- ],
- 'sources': [
- '<(DEPTH)/media/cast/test/linux_output_window.cc',
- '<(DEPTH)/media/cast/test/linux_output_window.h',
- ],
- }],
- ],
- },
- ], # targets
- }], # include_tests
+ 'includes': [ 'cast_testing.gypi' ]
+ }],
+ ],
+ 'targets': [
+ {
+ 'target_name': 'cast_base',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(DEPTH)/',
+ ],
+ 'dependencies': [
+ 'cast_logging_proto',
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/net/net.gyp:net',
+ ],
+ 'export_dependent_settings': [
+ 'cast_logging_proto',
+ ],
+ 'sources': [
+ 'cast_config.cc',
+ 'cast_config.h',
+ 'cast_defines.h',
+ 'cast_environment.cc',
+ 'cast_environment.h',
+ 'logging/encoding_event_subscriber.cc',
+ 'logging/encoding_event_subscriber.h',
+ 'logging/log_deserializer.cc',
+ 'logging/log_deserializer.h',
+ 'logging/log_serializer.cc',
+ 'logging/log_serializer.h',
+ 'logging/logging_defines.cc',
+ 'logging/logging_defines.h',
+ 'logging/logging_impl.cc',
+ 'logging/logging_impl.h',
+ 'logging/logging_raw.cc',
+ 'logging/logging_raw.h',
+ 'logging/raw_event_subscriber.h',
+ 'logging/simple_event_subscriber.cc',
+ 'logging/simple_event_subscriber.h',
+ 'logging/stats_event_subscriber.cc',
+ 'logging/stats_event_subscriber.h',
+ 'logging/stats_util.cc',
+ 'logging/stats_util.h',
+ 'transport/cast_transport_config.cc',
+ 'transport/cast_transport_config.h',
+ 'transport/cast_transport_defines.h',
+ 'transport/cast_transport_sender.h',
+ ], # source
+ },
+ {
+ 'target_name': 'cast_logging_proto',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(DEPTH)/',
+ ],
+ 'sources': [
+ 'logging/proto/proto_utils.cc',
+ 'logging/proto/raw_events.proto',
+ ],
+ 'variables': {
+ 'proto_in_dir': 'logging/proto',
+ 'proto_out_dir': 'media/cast/logging/proto',
+ },
+ 'includes': ['../../build/protoc.gypi'],
+ },
+ {
+ 'target_name': 'cast_receiver',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(DEPTH)/',
+# TODO(miu): Remove WebRTC dependency (RtpHeader), and then these two deps:
+ '<(DEPTH)/third_party/',
+ '<(DEPTH)/third_party/webrtc/',
+ ],
+ 'dependencies': [
+ 'cast_base',
+ 'cast_rtcp',
+ 'cast_transport',
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/media/media.gyp:shared_memory_support',
+ '<(DEPTH)/third_party/opus/opus.gyp:opus',
+ '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+ ],
+ 'sources': [
+ 'audio_receiver/audio_decoder.h',
+ 'audio_receiver/audio_decoder.cc',
+ 'audio_receiver/audio_receiver.h',
+ 'audio_receiver/audio_receiver.cc',
+ 'cast_receiver.h',
+ 'cast_receiver_impl.cc',
+ 'cast_receiver_impl.h',
+ 'framer/cast_message_builder.cc',
+ 'framer/cast_message_builder.h',
+ 'framer/frame_buffer.cc',
+ 'framer/frame_buffer.h',
+ 'framer/frame_id_map.cc',
+ 'framer/frame_id_map.h',
+ 'framer/framer.cc',
+ 'framer/framer.h',
+ 'rtp_receiver/receiver_stats.cc',
+ 'rtp_receiver/receiver_stats.h',
+ 'rtp_receiver/rtp_receiver.cc',
+ 'rtp_receiver/rtp_receiver.h',
+ 'rtp_receiver/rtp_parser/rtp_parser.cc',
+ 'rtp_receiver/rtp_parser/rtp_parser.h',
+ 'video_receiver/video_decoder.h',
+ 'video_receiver/video_decoder.cc',
+ 'video_receiver/video_receiver.h',
+ 'video_receiver/video_receiver.cc',
+ ], # source
+ },
+ {
+ 'target_name': 'cast_rtcp',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(DEPTH)/',
+ ],
+ 'dependencies': [
+ 'cast_base',
+ 'cast_transport',
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/net/net.gyp:net',
+ ],
+ 'sources': [
+ 'rtcp/rtcp_defines.cc',
+ 'rtcp/rtcp_defines.h',
+ 'rtcp/rtcp.h',
+ 'rtcp/rtcp.cc',
+ 'rtcp/rtcp_receiver.cc',
+ 'rtcp/rtcp_receiver.h',
+ 'rtcp/rtcp_sender.cc',
+ 'rtcp/rtcp_sender.h',
+ 'rtcp/rtcp_utility.cc',
+ 'rtcp/rtcp_utility.h',
+ 'rtcp/sender_rtcp_event_subscriber.cc',
+ 'rtcp/sender_rtcp_event_subscriber.h',
+ 'rtcp/receiver_rtcp_event_subscriber.cc',
+ 'rtcp/receiver_rtcp_event_subscriber.cc',
+ ], # source
+ },
+ {
+ 'target_name': 'cast_sender',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(DEPTH)/',
+ ],
+ 'dependencies': [
+ 'cast_base',
+ 'cast_rtcp',
+ 'cast_transport',
+ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/media/media.gyp:shared_memory_support',
+ '<(DEPTH)/third_party/opus/opus.gyp:opus',
+ '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
+ ], # dependencies
+ 'sources': [
+ 'audio_sender/audio_encoder.h',
+ 'audio_sender/audio_encoder.cc',
+ 'audio_sender/audio_sender.h',
+ 'audio_sender/audio_sender.cc',
+ 'cast_sender.h',
+ 'cast_sender_impl.cc',
+ 'cast_sender_impl.h',
+ 'congestion_control/congestion_control.h',
+ 'congestion_control/congestion_control.cc',
+ 'video_sender/codecs/vp8/vp8_encoder.cc',
+ 'video_sender/codecs/vp8/vp8_encoder.h',
+ 'video_sender/external_video_encoder.h',
+ 'video_sender/external_video_encoder.cc',
+ 'video_sender/fake_software_video_encoder.h',
+ 'video_sender/fake_software_video_encoder.cc',
+ 'video_sender/software_video_encoder.h',
+ 'video_sender/video_encoder.h',
+ 'video_sender/video_encoder_impl.h',
+ 'video_sender/video_encoder_impl.cc',
+ 'video_sender/video_sender.h',
+ 'video_sender/video_sender.cc',
+ ], # source
+ },
+ {
+ 'target_name': 'cast_transport',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(DEPTH)/',
+ ],
+ 'dependencies': [
+ 'cast_base',
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/crypto/crypto.gyp:crypto',
+ '<(DEPTH)/net/net.gyp:net',
+ ],
+ 'sources': [
+ 'transport/cast_transport_sender_impl.cc',
+ 'transport/cast_transport_sender_impl.h',
+ 'transport/pacing/paced_sender.cc',
+ 'transport/pacing/paced_sender.h',
+ 'transport/rtcp/rtcp_builder.cc',
+ 'transport/rtcp/rtcp_builder.h',
+ 'transport/rtp_sender/packet_storage/packet_storage.cc',
+ 'transport/rtp_sender/packet_storage/packet_storage.h',
+ 'transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc',
+ 'transport/rtp_sender/rtp_packetizer/rtp_packetizer.h',
+ 'transport/rtp_sender/rtp_sender.cc',
+ 'transport/rtp_sender/rtp_sender.h',
+ 'transport/transport/udp_transport.cc',
+ 'transport/transport/udp_transport.h',
+ 'transport/transport_audio_sender.cc',
+ 'transport/transport_audio_sender.h',
+ 'transport/transport_video_sender.cc',
+ 'transport/transport_video_sender.h',
+ 'transport/utility/transport_encryption_handler.cc',
+ 'transport/utility/transport_encryption_handler.h',
+ ], # source
+ },
],
}
« no previous file with comments | « media/cast/audio_sender/audio_sender.gypi ('k') | media/cast/cast_config.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698