diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 03:10:15 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 03:10:15 +0000 |
commit | 6558c66aba3a24386e818ef9923b6ee0a38d0485 (patch) | |
tree | 4d34d1323a29743e2249d5f83381b4ecbddd3ee7 /media/cast/cast_testing.gypi | |
parent | ed2c6b80ec652cff481d95581c7d74e2b7a14d11 (diff) | |
download | chromium_src-6558c66aba3a24386e818ef9923b6ee0a38d0485.zip chromium_src-6558c66aba3a24386e818ef9923b6ee0a38d0485.tar.gz chromium_src-6558c66aba3a24386e818ef9923b6ee0a38d0485.tar.bz2 |
Revert 265481 "[Cast] Consolidate plethora of GYP files into cas..."
this broke a ton of bots sample output here:
http://build.chromium.org/p/chromium.linux/builders/Linux%20Clang%20%28dbg%29/builds/58560/steps/compile/logs/stdio
> [Cast] Consolidate plethora of GYP files into cast.gyp and cast_testing.gypi.
>
> The proliferation of GYP files in the src/media/cast directory hierarchy
> has made refactoring efforts difficult to manage. This change reduces
> everything down to one GYP (plus one GYPI for the testing targets).
>
> This change was tested by building on Linux: `build/gyp_chromium && ninja -C out/Debug All`
>
> Review URL: https://codereview.chromium.org/245893005
TBR=miu@chromium.org
Review URL: https://codereview.chromium.org/247573007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/cast_testing.gypi')
-rw-r--r-- | media/cast/cast_testing.gypi | 219 |
1 files changed, 0 insertions, 219 deletions
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi deleted file mode 100644 index 8ac4326..0000000 --- a/media/cast/cast_testing.gypi +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'cast_receiver_app', - 'type': 'executable', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_base', - 'cast_receiver', - 'cast_test_utility', - 'cast_transport', - '<(DEPTH)/net/net.gyp:net_test_support', - '<(DEPTH)/media/media.gyp:media', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(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', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', - ], - }], - ], - }, - { - 'target_name': 'cast_sender_app', - 'type': 'executable', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_base', - 'cast_sender', - 'cast_test_utility', - 'cast_transport', - '<(DEPTH)/net/net.gyp:net_test_support', - '<(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)/ui/gfx/gfx.gyp:gfx_geometry', - ], - 'sources': [ - '<(DEPTH)/media/cast/test/sender.cc', - ], - }, - { - 'target_name': 'cast_test_utility', - 'type': 'static_library', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_receiver', - 'cast_transport', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', - ], - 'sources': [ - 'test/fake_single_thread_task_runner.cc', - 'test/fake_single_thread_task_runner.h', - 'test/utility/audio_utility.cc', - 'test/utility/audio_utility.h', - 'test/utility/barcode.cc', - 'test/utility/barcode.h', - 'test/utility/default_config.cc', - 'test/utility/default_config.h', - 'test/utility/in_process_receiver.cc', - 'test/utility/in_process_receiver.h', - 'test/utility/input_builder.cc', - 'test/utility/input_builder.h', - 'test/utility/standalone_cast_environment.cc', - 'test/utility/standalone_cast_environment.h', - 'test/utility/video_utility.cc', - 'test/utility/video_utility.h', - 'test/utility/udp_proxy.cc', - 'test/utility/udp_proxy.h', - ], # source - }, - { - 'target_name': 'cast_unittests', - 'type': '<(gtest_target_type)', - '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_receiver', - 'cast_rtcp', - 'cast_sender', - 'cast_test_utility', - 'cast_transport', - '<(DEPTH)/base/base.gyp:test_support_base', - '<(DEPTH)/net/net.gyp:net', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - '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', -# TODO(miu): The following two are test utility modules. Rename/move the files. - 'rtcp/test_rtcp_packet_builder.cc', - 'rtcp/test_rtcp_packet_builder.h', - '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': 'generate_barcode_video', - 'type': 'executable', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_test_utility', - '<(DEPTH)/media/media.gyp:media', - ], - 'sources': [ - 'test/utility/generate_barcode_video.cc', - ], - }, - { - 'target_name': 'generate_timecode_audio', - 'type': 'executable', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_base', - 'cast_test_utility', - 'cast_transport', - '<(DEPTH)/media/media.gyp:media', - ], - 'sources': [ - 'test/utility/generate_timecode_audio.cc', - ], - }, - { - 'target_name': 'udp_proxy', - 'type': 'executable', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_test_utility', - '<(DEPTH)/media/media.gyp:media', - ], - 'sources': [ - 'test/utility/udp_proxy_main.cc', - ], - }, - ], -} |