| Index: media/cast/cast.gyp
|
| diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
|
| index 33ac3f43919331a51a7f155cc137e1083e831629..e0d0c69f588655ffe4a75b1d8f9f5d983a75d75c 100644
|
| --- a/media/cast/cast.gyp
|
| +++ b/media/cast/cast.gyp
|
| @@ -23,70 +23,6 @@
|
| 'cast_defines.h',
|
| 'cast_environment.cc',
|
| 'cast_environment.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/logging_stats.cc',
|
| - 'logging/logging_stats.h',
|
| - 'logging/raw_event_subscriber.h',
|
| - 'logging/simple_event_subscriber.cc',
|
| - 'logging/simple_event_subscriber.h',
|
| - ], # source
|
| - },
|
| - {
|
| - 'target_name': 'cast_logging_proto_lib',
|
| - 'type': 'static_library',
|
| - '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': 'sender_logging',
|
| - 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '<(DEPTH)/',
|
| - ],
|
| - 'dependencies': [
|
| - 'cast_config',
|
| - 'cast_logging_proto_lib',
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - ],
|
| - 'export_dependent_settings': [
|
| - 'cast_logging_proto_lib',
|
| - ],
|
| - 'sources': [
|
| - 'logging/encoding_event_subscriber.cc',
|
| - 'logging/encoding_event_subscriber.h',
|
| - 'logging/log_serializer.cc',
|
| - 'logging/log_serializer.h',
|
| - ], # source
|
| - },
|
| - {
|
| - 'target_name': 'cast_log_analysis',
|
| - 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '<(DEPTH)/',
|
| - ],
|
| - 'dependencies': [
|
| - 'cast_config',
|
| - 'cast_logging_proto_lib',
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - ],
|
| - 'export_dependent_settings': [
|
| - 'cast_logging_proto_lib',
|
| - ],
|
| - 'sources': [
|
| - 'logging/log_deserializer.cc',
|
| - 'logging/log_deserializer.h',
|
| ], # source
|
| },
|
| ], # targets,
|
| @@ -98,11 +34,11 @@
|
| 'type': '<(gtest_target_type)',
|
| 'dependencies': [
|
| 'cast_config',
|
| - 'cast_log_analysis',
|
| - 'cast_logging_proto_lib',
|
| 'cast_receiver.gyp:cast_receiver',
|
| 'cast_sender.gyp:cast_sender',
|
| - 'sender_logging',
|
| + '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',
|
| @@ -153,6 +89,7 @@
|
| 'test/fake_single_thread_task_runner.h',
|
| 'test/fake_video_encode_accelerator.cc',
|
| 'test/fake_video_encode_accelerator.h',
|
| + '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',
|
| @@ -176,7 +113,7 @@
|
| ],
|
| 'dependencies': [
|
| 'cast_config',
|
| - 'sender_logging',
|
| + 'logging/logging.gyp:sender_logging',
|
| '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
|
| '<(DEPTH)/net/net.gyp:net_test_support',
|
| '<(DEPTH)/media/cast/cast_sender.gyp:*',
|
|
|