Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1051)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 10834032: Fix sorting issues in media.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 6481c76af3a5b16bae55799ed70c9a9f0ba43167..f1d5747a8df6c7f789ec21f7df170844b1152a6e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -15,13 +15,13 @@
'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',
@@ -43,17 +43,15 @@
'audio/async_socket_io_handler_win.cc',
'audio/audio_buffers_state.cc',
'audio/audio_buffers_state.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_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_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',
@@ -64,6 +62,8 @@
'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',
@@ -74,14 +74,12 @@
'audio/audio_util.h',
'audio/cross_process_notification.cc',
'audio/cross_process_notification.h',
- 'audio/cross_process_notification_win.cc',
'audio/cross_process_notification_posix.cc',
+ 'audio/cross_process_notification_win.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',
@@ -90,12 +88,12 @@
'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',
@@ -108,6 +106,8 @@
'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',
@@ -140,9 +140,9 @@
'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',
@@ -159,10 +159,10 @@
'base/data_source.h',
'base/decoder_buffer.cc',
'base/decoder_buffer.h',
- 'base/decrypt_config.cc',
- 'base/decrypt_config.h',
'base/decryptor.h',
'base/decryptor_client.h',
+ 'base/decrypt_config.cc',
+ 'base/decrypt_config.h',
'base/demuxer.cc',
'base/demuxer.h',
'base/demuxer_stream.cc',
@@ -280,9 +280,9 @@
'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',
@@ -538,10 +538,10 @@
'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',
@@ -645,10 +645,10 @@
'..',
],
'sources': [
- 'base/simd/convert_rgb_to_yuv_c.cc',
'base/simd/convert_rgb_to_yuv.h',
- 'base/simd/convert_yuv_to_rgb_c.cc',
+ 'base/simd/convert_rgb_to_yuv_c.cc',
'base/simd/convert_yuv_to_rgb.h',
+ 'base/simd/convert_yuv_to_rgb_c.cc',
'base/simd/filter_yuv.h',
'base/simd/filter_yuv_c.cc',
'base/simd/yuv_to_rgb_table.cc',
@@ -688,8 +688,8 @@
'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_unittest.cc',
'base/audio_renderer_mixer_input_unittest.cc',
+ 'base/audio_renderer_mixer_unittest.cc',
'base/bit_reader_unittest.cc',
'base/buffers_unittest.cc',
'base/clock_unittest.cc',
@@ -748,8 +748,8 @@
'base/test_data_util.cc',
'base/test_data_util.h',
'ffmpeg/ffmpeg_common_unittest.cc',
- 'filters/ffmpeg_audio_decoder_unittest.cc',
'filters/chunk_demuxer_unittest.cc',
+ 'filters/ffmpeg_audio_decoder_unittest.cc',
'filters/ffmpeg_demuxer_unittest.cc',
'filters/ffmpeg_glue_unittest.cc',
'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
@@ -886,8 +886,8 @@
'tools/player_wtl/player_wtl.cc',
'tools/player_wtl/player_wtl.rc',
'tools/player_wtl/props.h',
- 'tools/player_wtl/seek.h',
'tools/player_wtl/resource.h',
+ 'tools/player_wtl/seek.h',
'tools/player_wtl/view.h',
],
'msvs_settings': {
@@ -913,7 +913,6 @@
'../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',
@@ -922,6 +921,7 @@
'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',
],
@@ -1068,14 +1068,14 @@
'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',
@@ -1103,16 +1103,16 @@
'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/test_data_util.cc',
'base/run_all_unittests.cc',
+ 'base/test_data_util.cc',
'ffmpeg/ffmpeg_regression_tests.cc',
'filters/pipeline_integration_test_base.cc',
],
@@ -1132,9 +1132,9 @@
'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',
@@ -1144,9 +1144,9 @@
'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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698