| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
| 7     'chromium_code': 1, | 7     'chromium_code': 1, | 
| 8     # Override to dynamically link the PulseAudio library. | 8     # Override to dynamically link the PulseAudio library. | 
| 9     'use_pulseaudio%': 0, | 9     'use_pulseaudio%': 0, | 
| 10     # Override to dynamically link the cras (ChromeOS audio) library. | 10     # Override to dynamically link the cras (ChromeOS audio) library. | 
| 11     'use_cras%': 0, | 11     'use_cras%': 0, | 
| 12   }, | 12   }, | 
| 13   'targets': [ | 13   'targets': [ | 
| 14     { | 14     { | 
|  | 15       'target_name': 'shared_memory_support', | 
|  | 16       'type': '<(component)', | 
|  | 17       'dependencies': [ | 
|  | 18         '../base/base.gyp:base', | 
|  | 19       ], | 
|  | 20       'defines': [ | 
|  | 21         'MEDIA_IMPLEMENTATION', | 
|  | 22       ], | 
|  | 23       'include_dirs': [ | 
|  | 24         '..', | 
|  | 25       ], | 
|  | 26       'includes': [ | 
|  | 27         'shared_memory_support.gypi', | 
|  | 28       ], | 
|  | 29       'sources': [ | 
|  | 30         '<@(shared_memory_support_sources)', | 
|  | 31       ], | 
|  | 32     }, | 
|  | 33     { | 
| 15       'target_name': 'media', | 34       'target_name': 'media', | 
| 16       'type': '<(component)', | 35       'type': '<(component)', | 
| 17       'dependencies': [ | 36       'dependencies': [ | 
| 18         '../base/base.gyp:base', | 37         '../base/base.gyp:base', | 
| 19         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
      _annotations', | 38         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
      _annotations', | 
| 20         '../build/temp_gyp/googleurl.gyp:googleurl', | 39         '../build/temp_gyp/googleurl.gyp:googleurl', | 
| 21         '../crypto/crypto.gyp:crypto', | 40         '../crypto/crypto.gyp:crypto', | 
|  | 41         'shared_memory_support', | 
| 22         '../ui/ui.gyp:ui', | 42         '../ui/ui.gyp:ui', | 
| 23         'yuv_convert', | 43         'yuv_convert', | 
| 24       ], | 44       ], | 
| 25       'defines': [ | 45       'defines': [ | 
| 26         'MEDIA_IMPLEMENTATION', | 46         'MEDIA_IMPLEMENTATION', | 
| 27       ], | 47       ], | 
| 28       'include_dirs': [ | 48       'include_dirs': [ | 
| 29         '..', | 49         '..', | 
| 30       ], | 50       ], | 
| 31       'sources': [ | 51       'sources': [ | 
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 66         'audio/audio_output_dispatcher.cc', | 86         'audio/audio_output_dispatcher.cc', | 
| 67         'audio/audio_output_dispatcher.h', | 87         'audio/audio_output_dispatcher.h', | 
| 68         'audio/audio_output_dispatcher_impl.cc', | 88         'audio/audio_output_dispatcher_impl.cc', | 
| 69         'audio/audio_output_dispatcher_impl.h', | 89         'audio/audio_output_dispatcher_impl.h', | 
| 70         'audio/audio_output_ipc.cc', | 90         'audio/audio_output_ipc.cc', | 
| 71         'audio/audio_output_ipc.h', | 91         'audio/audio_output_ipc.h', | 
| 72         'audio/audio_output_mixer.cc', | 92         'audio/audio_output_mixer.cc', | 
| 73         'audio/audio_output_mixer.h', | 93         'audio/audio_output_mixer.h', | 
| 74         'audio/audio_output_proxy.cc', | 94         'audio/audio_output_proxy.cc', | 
| 75         'audio/audio_output_proxy.h', | 95         'audio/audio_output_proxy.h', | 
| 76         'audio/audio_parameters.cc', |  | 
| 77         'audio/audio_parameters.h', |  | 
| 78         'audio/audio_util.cc', | 96         'audio/audio_util.cc', | 
| 79         'audio/audio_util.h', | 97         'audio/audio_util.h', | 
| 80         'audio/cross_process_notification.cc', | 98         'audio/cross_process_notification.cc', | 
| 81         'audio/cross_process_notification.h', | 99         'audio/cross_process_notification.h', | 
| 82         'audio/cross_process_notification_posix.cc', | 100         'audio/cross_process_notification_posix.cc', | 
| 83         'audio/cross_process_notification_win.cc', | 101         'audio/cross_process_notification_win.cc', | 
| 84         'audio/fake_audio_input_stream.cc', | 102         'audio/fake_audio_input_stream.cc', | 
| 85         'audio/fake_audio_input_stream.h', | 103         'audio/fake_audio_input_stream.h', | 
| 86         'audio/fake_audio_output_stream.cc', | 104         'audio/fake_audio_output_stream.cc', | 
| 87         'audio/fake_audio_output_stream.h', | 105         'audio/fake_audio_output_stream.h', | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 130         'audio/win/avrt_wrapper_win.cc', | 148         'audio/win/avrt_wrapper_win.cc', | 
| 131         'audio/win/avrt_wrapper_win.h', | 149         'audio/win/avrt_wrapper_win.h', | 
| 132         'audio/win/device_enumeration_win.cc', | 150         'audio/win/device_enumeration_win.cc', | 
| 133         'audio/win/device_enumeration_win.h', | 151         'audio/win/device_enumeration_win.h', | 
| 134         'audio/win/wavein_input_win.cc', | 152         'audio/win/wavein_input_win.cc', | 
| 135         'audio/win/wavein_input_win.h', | 153         'audio/win/wavein_input_win.h', | 
| 136         'audio/win/waveout_output_win.cc', | 154         'audio/win/waveout_output_win.cc', | 
| 137         'audio/win/waveout_output_win.h', | 155         'audio/win/waveout_output_win.h', | 
| 138         'base/android/media_jni_registrar.cc', | 156         'base/android/media_jni_registrar.cc', | 
| 139         'base/android/media_jni_registrar.h', | 157         'base/android/media_jni_registrar.h', | 
| 140         'base/audio_bus.cc', |  | 
| 141         'base/audio_bus.h', |  | 
| 142         'base/audio_decoder.cc', | 158         'base/audio_decoder.cc', | 
| 143         'base/audio_decoder.h', | 159         'base/audio_decoder.h', | 
| 144         'base/audio_decoder_config.cc', | 160         'base/audio_decoder_config.cc', | 
| 145         'base/audio_decoder_config.h', | 161         'base/audio_decoder_config.h', | 
| 146         'base/audio_renderer.cc', | 162         'base/audio_renderer.cc', | 
| 147         'base/audio_renderer.h', | 163         'base/audio_renderer.h', | 
| 148         'base/audio_renderer_mixer.cc', | 164         'base/audio_renderer_mixer.cc', | 
| 149         'base/audio_renderer_mixer.h', | 165         'base/audio_renderer_mixer.h', | 
| 150         'base/audio_renderer_mixer_input.cc', | 166         'base/audio_renderer_mixer_input.cc', | 
| 151         'base/audio_renderer_mixer_input.h', | 167         'base/audio_renderer_mixer_input.h', | 
| 152         'base/bitstream_buffer.h', | 168         'base/bitstream_buffer.h', | 
| 153         'base/bit_reader.cc', | 169         'base/bit_reader.cc', | 
| 154         'base/bit_reader.h', | 170         'base/bit_reader.h', | 
| 155         'base/buffers.cc', | 171         'base/buffers.cc', | 
| 156         'base/buffers.h', | 172         'base/buffers.h', | 
| 157         'base/byte_queue.cc', | 173         'base/byte_queue.cc', | 
| 158         'base/byte_queue.h', | 174         'base/byte_queue.h', | 
| 159         'base/channel_layout.cc', |  | 
| 160         'base/channel_layout.h', |  | 
| 161         'base/clock.cc', | 175         'base/clock.cc', | 
| 162         'base/clock.h', | 176         'base/clock.h', | 
| 163         'base/data_buffer.cc', | 177         'base/data_buffer.cc', | 
| 164         'base/data_buffer.h', | 178         'base/data_buffer.h', | 
| 165         'base/data_source.cc', | 179         'base/data_source.cc', | 
| 166         'base/data_source.h', | 180         'base/data_source.h', | 
| 167         'base/decoder_buffer.cc', | 181         'base/decoder_buffer.cc', | 
| 168         'base/decoder_buffer.h', | 182         'base/decoder_buffer.h', | 
| 169         'base/decryptor.h', | 183         'base/decryptor.h', | 
| 170         'base/decryptor_client.h', | 184         'base/decryptor_client.h', | 
| 171         'base/decrypt_config.cc', | 185         'base/decrypt_config.cc', | 
| 172         'base/decrypt_config.h', | 186         'base/decrypt_config.h', | 
| 173         'base/demuxer.cc', | 187         'base/demuxer.cc', | 
| 174         'base/demuxer.h', | 188         'base/demuxer.h', | 
| 175         'base/demuxer_stream.cc', | 189         'base/demuxer_stream.cc', | 
| 176         'base/demuxer_stream.h', | 190         'base/demuxer_stream.h', | 
| 177         'base/djb2.cc', | 191         'base/djb2.cc', | 
| 178         'base/djb2.h', | 192         'base/djb2.h', | 
| 179         'base/filter_collection.cc', | 193         'base/filter_collection.cc', | 
| 180         'base/filter_collection.h', | 194         'base/filter_collection.h', | 
| 181         'base/media.h', | 195         'base/media.h', | 
| 182         'base/media_android.cc', | 196         'base/media_android.cc', | 
| 183         'base/media_export.h', |  | 
| 184         'base/media_log.cc', | 197         'base/media_log.cc', | 
| 185         'base/media_log.h', | 198         'base/media_log.h', | 
| 186         'base/media_log_event.h', | 199         'base/media_log_event.h', | 
| 187         'base/media_posix.cc', | 200         'base/media_posix.cc', | 
| 188         'base/media_switches.cc', | 201         'base/media_switches.cc', | 
| 189         'base/media_switches.h', | 202         'base/media_switches.h', | 
| 190         'base/media_win.cc', | 203         'base/media_win.cc', | 
| 191         'base/message_loop_factory.cc', | 204         'base/message_loop_factory.cc', | 
| 192         'base/message_loop_factory.h', | 205         'base/message_loop_factory.h', | 
| 193         'base/multi_channel_resampler.cc', | 206         'base/multi_channel_resampler.cc', | 
| (...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1163             'media', | 1176             'media', | 
| 1164           ], | 1177           ], | 
| 1165           'sources': [ | 1178           'sources': [ | 
| 1166             'tools/media_bench/media_bench.cc', | 1179             'tools/media_bench/media_bench.cc', | 
| 1167           ], | 1180           ], | 
| 1168         }, | 1181         }, | 
| 1169       ], | 1182       ], | 
| 1170     }] | 1183     }] | 
| 1171   ], | 1184   ], | 
| 1172 } | 1185 } | 
| OLD | NEW | 
|---|