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

Unified Diff: media/media.gyp

Issue 541553003: Make ffmpeg specific unit_tests depend on media_use_ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased patch to latest master Created 6 years, 3 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 | « media/BUILD.gn ('k') | 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 0f8b4765460de67d42613d1425444c6ae6247214..7d9a783a37f74f6729938fc5a58c73f29c4cb9a0 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1237,7 +1237,19 @@
}, { # media_use_ffmpeg== 0
'sources!': [
'base/audio_video_metadata_extractor_unittest.cc',
+ 'base/container_names_unittest.cc',
'base/media_file_checker_unittest.cc',
+ 'ffmpeg/ffmpeg_common_unittest.cc',
+ 'filters/audio_decoder_unittest.cc',
+ 'filters/audio_file_reader_unittest.cc',
+ 'filters/blocking_url_protocol_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/in_memory_url_protocol_unittest.cc',
+ 'filters/pipeline_integration_test.cc',
+ 'filters/pipeline_integration_test_base.cc',
],
}],
['use_alsa==1', {
@@ -1262,18 +1274,6 @@
['OS=="android"', {
'sources!': [
'audio/audio_input_volume_unittest.cc',
- 'base/container_names_unittest.cc',
- 'ffmpeg/ffmpeg_common_unittest.cc',
- 'filters/audio_decoder_unittest.cc',
- 'filters/audio_file_reader_unittest.cc',
- 'filters/blocking_url_protocol_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/in_memory_url_protocol_unittest.cc',
- 'filters/pipeline_integration_test.cc',
- 'filters/pipeline_integration_test_base.cc',
],
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',
« no previous file with comments | « media/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698