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

Side by Side Diff: media/media.gyp

Issue 9293033: Fix Android build after r119851 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just exclude the files. Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 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 }, 10 },
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 'filters/ffmpeg_demuxer_factory.cc', 285 'filters/ffmpeg_demuxer_factory.cc',
286 'filters/ffmpeg_demuxer_factory.h', 286 'filters/ffmpeg_demuxer_factory.h',
287 'filters/ffmpeg_h264_bitstream_converter.cc', 287 'filters/ffmpeg_h264_bitstream_converter.cc',
288 'filters/ffmpeg_h264_bitstream_converter.h', 288 'filters/ffmpeg_h264_bitstream_converter.h',
289 'filters/ffmpeg_glue.cc', 289 'filters/ffmpeg_glue.cc',
290 'filters/ffmpeg_glue.h', 290 'filters/ffmpeg_glue.h',
291 'filters/ffmpeg_video_decoder.cc', 291 'filters/ffmpeg_video_decoder.cc',
292 'filters/ffmpeg_video_decoder.h', 292 'filters/ffmpeg_video_decoder.h',
293 'filters/gpu_video_decoder.cc', 293 'filters/gpu_video_decoder.cc',
294 'filters/gpu_video_decoder.h', 294 'filters/gpu_video_decoder.h',
295 'webm/webm_cluster_parser.cc',
296 'webm/webm_cluster_parser.h',
295 'webm/webm_stream_parser.cc', 297 'webm/webm_stream_parser.cc',
296 'webm/webm_stream_parser.h', 298 'webm/webm_stream_parser.h',
297 ], 299 ],
298 }], 300 }],
299 # The below 'android' condition were added temporarily and should be 301 # The below 'android' condition were added temporarily and should be
300 # removed in downstream, because there is no Java environment setup in 302 # removed in downstream, because there is no Java environment setup in
301 # upstream yet. 303 # upstream yet.
302 ['OS == "android"', { 304 ['OS == "android"', {
303 'sources!':[ 305 'sources!':[
304 'audio/android/audio_track_output_android.cc', 306 'audio/android/audio_track_output_android.cc',
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 899 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
898 ], 900 ],
899 'sources': [ 901 'sources': [
900 'tools/media_bench/media_bench.cc', 902 'tools/media_bench/media_bench.cc',
901 ], 903 ],
902 }, 904 },
903 ], 905 ],
904 }] 906 }]
905 ], 907 ],
906 } 908 }
OLDNEW
« 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