Cast: Reshuffle files under media/cast

media/cast/cast.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'include_tests%': 1,
     'chromium_code': 1,
   },
   'conditions': [
     ['include_tests==1', {
       '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)/crypto/crypto.gyp:crypto',
         '<(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',
-        'base/clock_drift_smoother.cc',
-        'base/clock_drift_smoother.h',
+        'common/clock_drift_smoother.cc',
+        'common/clock_drift_smoother.h',
+        'common/transport_encryption_handler.cc',
+        'common/transport_encryption_handler.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/raw_event_subscriber_bundle.cc',
         'logging/raw_event_subscriber_bundle.h',
         'logging/receiver_time_offset_estimator.h',
         'logging/receiver_time_offset_estimator_impl.cc',
         'logging/receiver_time_offset_estimator_impl.h',
         'logging/simple_event_subscriber.cc',
         'logging/simple_event_subscriber.h',
         'logging/stats_event_subscriber.cc',
         'logging/stats_event_subscriber.h',
         'rtp_timestamp_helper.cc',
         'rtp_timestamp_helper.h',
-        'transport/cast_transport_config.cc',

[miu, 2014/07/11 01:19:36]

Does everything still link with cast_transport_defines/config moved?

[Alpha Left Google, 2014/07/11 18:11:26]

Yes it does. It's weird these files are in this target.

-        'transport/cast_transport_config.h',
-        'transport/cast_transport_defines.h',
-        'transport/cast_transport_sender.h',
       ], # source
     },
     {
       # GN version: //media/cast/logging/proto
       'target_name': 'cast_logging_proto',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'sources': [
@@ skipping 117 matching lines @@
     },
     {
       '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_config.cc',
+        'transport/cast_transport_config.h',
+        'transport/cast_transport_defines.h',
+        'transport/cast_transport_sender.h',
         '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/utility/transport_encryption_handler.cc',
-        'transport/utility/transport_encryption_handler.h',
+        'transport/rtp/packet_storage.cc',
+        'transport/rtp/packet_storage.h',
+        'transport/rtp/rtp_packetizer.cc',
+        'transport/rtp/rtp_packetizer.h',
+        'transport/rtp/rtp_sender.cc',
+        'transport/rtp/rtp_sender.h',
+        'transport/udp_transport.cc',
+        'transport/udp_transport.h',
       ], # source
     },
   ],
 }