Cast: Reshuffle files under media/cast

media/cast/cast.gyp

Index: media/cast/cast.gyp
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index ac593c8e470a5ef65433fc559e1c1152554e9068..d318bce54348dce6f0dfa2da46e20a952f8cbfc7 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -22,6 +22,7 @@
       'dependencies': [
         'cast_logging_proto',
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/net/net.gyp:net',
       ],
       'export_dependent_settings': [
@@ -33,8 +34,10 @@
         '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',
@@ -59,10 +62,6 @@
         '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
     },
     {
@@ -200,26 +199,27 @@
       '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
     },
   ],