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

Side by Side Diff: media/media.gyp

Issue 8361031: Reland the CL 8162015. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 }, 10 },
(...skipping 15 matching lines...) Expand all
26 ], 26 ],
27 'include_dirs': [ 27 'include_dirs': [
28 '..', 28 '..',
29 ], 29 ],
30 'sources': [ 30 'sources': [
31 'audio/audio_buffers_state.cc', 31 'audio/audio_buffers_state.cc',
32 'audio/audio_buffers_state.h', 32 'audio/audio_buffers_state.h',
33 'audio/audio_io.h', 33 'audio/audio_io.h',
34 'audio/audio_input_controller.cc', 34 'audio/audio_input_controller.cc',
35 'audio/audio_input_controller.h', 35 'audio/audio_input_controller.h',
36 'audio/audio_device_name.cc',
36 'audio/audio_device_name.h', 37 'audio/audio_device_name.h',
37 'audio/audio_manager.cc', 38 'audio/audio_manager.cc',
38 'audio/audio_manager.h', 39 'audio/audio_manager.h',
39 'audio/audio_manager_base.cc', 40 'audio/audio_manager_base.cc',
40 'audio/audio_manager_base.h', 41 'audio/audio_manager_base.h',
41 'audio/audio_output_controller.cc', 42 'audio/audio_output_controller.cc',
42 'audio/audio_output_controller.h', 43 'audio/audio_output_controller.h',
43 'audio/audio_output_dispatcher.cc', 44 'audio/audio_output_dispatcher.cc',
44 'audio/audio_output_dispatcher.h', 45 'audio/audio_output_dispatcher.h',
45 'audio/audio_output_proxy.cc', 46 'audio/audio_output_proxy.cc',
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 884 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
884 ], 885 ],
885 'sources': [ 886 'sources': [
886 'tools/media_bench/media_bench.cc', 887 'tools/media_bench/media_bench.cc',
887 ], 888 ],
888 }, 889 },
889 ], 890 ],
890 }] 891 }]
891 ], 892 ],
892 } 893 }
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698