Fix sorting issues in media.gyp

media/media.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
     # Override to dynamically link the PulseAudio library.
     'use_pulseaudio%': 0,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
   },
   'targets': [
     {
       'target_name': 'media',
       'type': '<(component)',
       'dependencies': [
-        'yuv_convert',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../third_party/openmax/openmax.gyp:il',
         '../ui/ui.gyp:ui',
+        'yuv_convert',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'audio/android/audio_manager_android.cc',
         'audio/android/audio_manager_android.h',
         'audio/android/audio_track_output_android.cc',
         'audio/android/audio_track_output_android.h',
         'audio/android/opensles_input.cc',
         'audio/android/opensles_input.h',
         'audio/android/opensles_output.cc',
         'audio/android/opensles_output.h',
         'audio/async_socket_io_handler.h',
         'audio/async_socket_io_handler_posix.cc',
         'audio/async_socket_io_handler_win.cc',
         'audio/audio_buffers_state.cc',
         'audio/audio_buffers_state.h',
+        'audio/audio_device_name.cc',
+        'audio/audio_device_name.h',
+        'audio/audio_input_controller.cc',
+        'audio/audio_input_controller.h',
         'audio/audio_input_ipc.cc',
         'audio/audio_input_ipc.h',
-        'audio/audio_output_ipc.cc',
-        'audio/audio_output_ipc.h',
-        'audio/audio_io.h',
-        'audio/audio_input_controller.cc',
-        'audio/audio_input_controller.h',
         'audio/audio_input_stream_impl.cc',
         'audio/audio_input_stream_impl.h',
-        'audio/audio_device_name.cc',
-        'audio/audio_device_name.h',
+        'audio/audio_io.h',
         'audio/audio_manager.cc',
         'audio/audio_manager.h',
         'audio/audio_manager_base.cc',
         'audio/audio_manager_base.h',
         'audio/audio_output_controller.cc',
         'audio/audio_output_controller.h',
         'audio/audio_output_dispatcher.cc',
         'audio/audio_output_dispatcher.h',
         'audio/audio_output_dispatcher_impl.cc',
         'audio/audio_output_dispatcher_impl.h',
+        'audio/audio_output_ipc.cc',
+        'audio/audio_output_ipc.h',
         'audio/audio_output_mixer.cc',
         'audio/audio_output_mixer.h',
         'audio/audio_output_proxy.cc',
         'audio/audio_output_proxy.h',
         'audio/audio_parameters.cc',
         'audio/audio_parameters.h',
         'audio/audio_util.cc',
         'audio/audio_util.h',
         'audio/cross_process_notification.cc',
         'audio/cross_process_notification.h',
+        'audio/cross_process_notification_posix.cc',
         'audio/cross_process_notification_win.cc',
-        'audio/cross_process_notification_posix.cc',
         'audio/fake_audio_input_stream.cc',
         'audio/fake_audio_input_stream.h',
         'audio/fake_audio_output_stream.cc',
         'audio/fake_audio_output_stream.h',
-        'audio/linux/audio_manager_linux.cc',
-        'audio/linux/audio_manager_linux.h',
         'audio/linux/alsa_input.cc',
         'audio/linux/alsa_input.h',
         'audio/linux/alsa_output.cc',
         'audio/linux/alsa_output.h',
         'audio/linux/alsa_util.cc',
         'audio/linux/alsa_util.h',
         'audio/linux/alsa_wrapper.cc',
         'audio/linux/alsa_wrapper.h',
+        'audio/linux/audio_manager_linux.cc',
+        'audio/linux/audio_manager_linux.h',
         'audio/linux/cras_input.cc',
         'audio/linux/cras_input.h',
         'audio/linux/cras_output.cc',
         'audio/linux/cras_output.h',
-        'audio/openbsd/audio_manager_openbsd.cc',
-        'audio/openbsd/audio_manager_openbsd.h',
         'audio/mac/audio_input_mac.cc',
         'audio/mac/audio_input_mac.h',
         'audio/mac/audio_low_latency_input_mac.cc',
         'audio/mac/audio_low_latency_input_mac.h',
         'audio/mac/audio_low_latency_output_mac.cc',
         'audio/mac/audio_low_latency_output_mac.h',
         'audio/mac/audio_manager_mac.cc',
         'audio/mac/audio_manager_mac.h',
         'audio/mac/audio_output_mac.cc',
         'audio/mac/audio_output_mac.h',
         'audio/null_audio_sink.cc',
         'audio/null_audio_sink.h',
+        'audio/openbsd/audio_manager_openbsd.cc',
+        'audio/openbsd/audio_manager_openbsd.h',
         'audio/pulse/pulse_output.cc',
         'audio/pulse/pulse_output.h',
         'audio/sample_rates.cc',
         'audio/sample_rates.h',
         'audio/simple_sources.cc',
         'audio/simple_sources.h',
         'audio/win/audio_low_latency_input_win.cc',
         'audio/win/audio_low_latency_input_win.h',
         'audio/win/audio_low_latency_output_win.cc',
         'audio/win/audio_low_latency_output_win.h',
@@ skipping 12 matching lines @@
         'base/audio_decoder.cc',
         'base/audio_decoder.h',
         'base/audio_decoder_config.cc',
         'base/audio_decoder_config.h',
         'base/audio_renderer.cc',
         'base/audio_renderer.h',
         'base/audio_renderer_mixer.cc',
         'base/audio_renderer_mixer.h',
         'base/audio_renderer_mixer_input.cc',
         'base/audio_renderer_mixer_input.h',
+        'base/bitstream_buffer.h',
         'base/bit_reader.cc',
         'base/bit_reader.h',
-        'base/bitstream_buffer.h',
         'base/buffers.cc',
         'base/buffers.h',
         'base/byte_queue.cc',
         'base/byte_queue.h',
         'base/callback_util.cc',
         'base/callback_util.h',
         'base/channel_layout.cc',
         'base/channel_layout.h',
         'base/clock.cc',
         'base/clock.h',
         'base/data_buffer.cc',
         'base/data_buffer.h',
         'base/data_source.cc',
         'base/data_source.h',
         'base/decoder_buffer.cc',
         'base/decoder_buffer.h',
+        'base/decryptor.h',
+        'base/decryptor_client.h',
         'base/decrypt_config.cc',
         'base/decrypt_config.h',
-        'base/decryptor.h',
-        'base/decryptor_client.h',
         'base/demuxer.cc',
         'base/demuxer.h',
         'base/demuxer_stream.cc',
         'base/demuxer_stream.h',
         'base/djb2.cc',
         'base/djb2.h',
         'base/filter_collection.cc',
         'base/filter_collection.h',
         'base/media.h',
         'base/media_android.cc',
@@ skipping 97 matching lines @@
         'video/capture/win/sink_filter_win.cc',
         'video/capture/win/sink_filter_win.h',
         'video/capture/win/sink_input_pin_win.cc',
         'video/capture/win/sink_input_pin_win.h',
         'video/capture/win/video_capture_device_win.cc',
         'video/capture/win/video_capture_device_win.h',
         'video/picture.cc',
         'video/picture.h',
         'video/video_decode_accelerator.cc',
         'video/video_decode_accelerator.h',
-        'webm/webm_constants.h',
         'webm/webm_cluster_parser.cc',
         'webm/webm_cluster_parser.h',
+        'webm/webm_constants.h',
         'webm/webm_content_encodings.cc',
         'webm/webm_content_encodings.h',
         'webm/webm_content_encodings_client.cc',
         'webm/webm_content_encodings_client.h',
         'webm/webm_info_parser.cc',
         'webm/webm_info_parser.h',
         'webm/webm_parser.cc',
         'webm/webm_parser.h',
         'webm/webm_stream_parser.cc',
         'webm/webm_stream_parser.h',
@@ skipping 235 matching lines @@
       'include_dirs': [
         '..',
       ],
       'sources': [
         'base/simd/convert_rgb_to_yuv_c.cc',
         'base/simd/convert_rgb_to_yuv_sse2.cc',
         'base/simd/convert_rgb_to_yuv_ssse3.asm',
         'base/simd/convert_rgb_to_yuv_ssse3.cc',
         'base/simd/convert_rgb_to_yuv_ssse3.inc',
         'base/simd/convert_yuv_to_rgb_c.cc',
-        'base/simd/convert_yuv_to_rgb_x86.cc',
         'base/simd/convert_yuv_to_rgb_mmx.asm',
         'base/simd/convert_yuv_to_rgb_mmx.inc',
         'base/simd/convert_yuv_to_rgb_sse.asm',
+        'base/simd/convert_yuv_to_rgb_x86.cc',
         'base/simd/filter_yuv.h',
         'base/simd/filter_yuv_c.cc',
         'base/simd/filter_yuv_mmx.cc',
         'base/simd/filter_yuv_sse2.cc',
         'base/simd/linear_scale_yuv_to_rgb_mmx.asm',
         'base/simd/linear_scale_yuv_to_rgb_mmx.inc',
         'base/simd/linear_scale_yuv_to_rgb_sse.asm',
         'base/simd/scale_yuv_to_rgb_mmx.asm',
         'base/simd/scale_yuv_to_rgb_mmx.inc',
         'base/simd/scale_yuv_to_rgb_sse.asm',
@@ skipping 83 matching lines @@
         '../third_party/yasm/yasm_compile.gypi',
       ],
     },
     {
       'target_name': 'yuv_convert_simd_arm',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'base/simd/convert_rgb_to_yuv.h',
         'base/simd/convert_rgb_to_yuv_c.cc',
-        'base/simd/convert_rgb_to_yuv.h',
+        'base/simd/convert_yuv_to_rgb.h',
         'base/simd/convert_yuv_to_rgb_c.cc',
-        'base/simd/convert_yuv_to_rgb.h',
         'base/simd/filter_yuv.h',
         'base/simd/filter_yuv_c.cc',
         'base/simd/yuv_to_rgb_table.cc',
         'base/simd/yuv_to_rgb_table.h',
       ],
     },
     {
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ skipping 19 matching lines @@
         'audio/audio_parameters_unittest.cc',
         'audio/audio_util_unittest.cc',
         'audio/cross_process_notification_unittest.cc',
         'audio/linux/alsa_output_unittest.cc',
         'audio/mac/audio_low_latency_input_mac_unittest.cc',
         'audio/mac/audio_output_mac_unittest.cc',
         'audio/simple_sources_unittest.cc',
         'audio/win/audio_low_latency_input_win_unittest.cc',
         'audio/win/audio_low_latency_output_win_unittest.cc',
         'audio/win/audio_output_win_unittest.cc',
+        'base/audio_renderer_mixer_input_unittest.cc',
         'base/audio_renderer_mixer_unittest.cc',
-        'base/audio_renderer_mixer_input_unittest.cc',
         'base/bit_reader_unittest.cc',
         'base/buffers_unittest.cc',
         'base/clock_unittest.cc',
         'base/data_buffer_unittest.cc',
         'base/decoder_buffer_unittest.cc',
         'base/djb2_unittest.cc',
         'base/filter_collection_unittest.cc',
         'base/multi_channel_resampler_unittest.cc',
         'base/pipeline_unittest.cc',
         'base/ranges_unittest.cc',
@@ skipping 38 matching lines @@
               ],
             }],
           ],
         }],
         ['OS=="android"', {
           'sources!': [
             'audio/audio_input_volume_unittest.cc',
             'base/test_data_util.cc',
             'base/test_data_util.h',
             'ffmpeg/ffmpeg_common_unittest.cc',
+            'filters/chunk_demuxer_unittest.cc',
             'filters/ffmpeg_audio_decoder_unittest.cc',
-            'filters/chunk_demuxer_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'filters/pipeline_integration_test.cc',
             'filters/pipeline_integration_test_base.cc',
             'mp4/mp4_stream_parser_unittest.cc',
             'webm/webm_cluster_parser_unittest.cc',
           ],
           'conditions': [
@@ skipping 116 matching lines @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
             'tools/player_wtl/list.h',
             'tools/player_wtl/mainfrm.h',
             'tools/player_wtl/movie.cc',
             'tools/player_wtl/movie.h',
             'tools/player_wtl/player_wtl.cc',
             'tools/player_wtl/player_wtl.rc',
             'tools/player_wtl/props.h',
+            'tools/player_wtl/resource.h',
             'tools/player_wtl/seek.h',
-            'tools/player_wtl/resource.h',
             'tools/player_wtl/view.h',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
             },
           },
           'defines': [
             '_CRT_SECURE_NO_WARNINGS=1',
           ],
         },
       ],
     }],
     ['OS == "win" or toolkit_uses_gtk == 1', {
       'targets': [
         {
           'target_name': 'shader_bench',
           'type': 'executable',
           'dependencies': [
             'media',
             'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gl/gl.gyp:gl',
           ],
           'sources': [
-            'tools/shader_bench/shader_bench.cc',
             'tools/shader_bench/cpu_color_painter.cc',
             'tools/shader_bench/cpu_color_painter.h',
             'tools/shader_bench/gpu_color_painter.cc',
             'tools/shader_bench/gpu_color_painter.h',
             'tools/shader_bench/gpu_painter.cc',
             'tools/shader_bench/gpu_painter.h',
             'tools/shader_bench/painter.cc',
             'tools/shader_bench/painter.h',
+            'tools/shader_bench/shader_bench.cc',
             'tools/shader_bench/window.cc',
             'tools/shader_bench/window.h',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
               'sources': [
                 'tools/shader_bench/window_linux.cc',
@@ skipping 126 matching lines @@
         },
 
       ],
     }, { # OS != "android"'
       # Android does not use ffmpeg, so disable the targets which require it.
       'targets': [
         {
           'target_name': 'ffmpeg_unittests',
           'type': 'executable',
           'dependencies': [
-            'media',
-            'media_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+            'media',
+            'media_test_support',
           ],
           'sources': [
             'ffmpeg/ffmpeg_unittest.cc',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 # Needed for the following #include chain:
                 #   base/run_all_unittests.cc
                 #   ../base/test_suite.h
                 #   gtk/gtk.h
                 '../build/linux/system.gyp:gtk',
               ],
               'conditions': [
                 ['linux_use_tcmalloc==1', {
                   'dependencies': [
                     '../base/allocator/allocator.gyp:allocator',
                   ],
                 }],
               ],
             }],
           ],
         },
         {
           'target_name': 'ffmpeg_regression_tests',
           'type': 'executable',
           'dependencies': [
-            'media',
-            'media_test_support',
             '../base/base.gyp:test_support_base',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+            'media',
+            'media_test_support',
           ],
           'sources': [
+            'base/run_all_unittests.cc',
             'base/test_data_util.cc',
-            'base/run_all_unittests.cc',
             'ffmpeg/ffmpeg_regression_tests.cc',
             'filters/pipeline_integration_test_base.cc',
           ],
           'conditions': [
             ['os_posix==1 and OS!="mac"', {
               'conditions': [
                 ['linux_use_tcmalloc==1', {
                   'dependencies': [
                     '../base/allocator/allocator.gyp:allocator',
                   ],
                 }],
               ],
             }],
           ],
         },
         {
           'target_name': 'ffmpeg_tests',
           'type': 'executable',
           'dependencies': [
-            'media',
             '../base/base.gyp:base',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+            'media',
           ],
           'sources': [
             'test/ffmpeg_tests/ffmpeg_tests.cc',
           ],
         },
         {
           'target_name': 'media_bench',
           'type': 'executable',
           'dependencies': [
-            'media',
             '../base/base.gyp:base',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+            'media',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
         },
       ],
     }]
   ],
 }