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

Unified Diff: media/media.gyp

Issue 1727953005: Enable AudioDecoder unit tests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added media.gyp changes Created 4 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 side-by-side diff with in-line comments
Download patch
« media/BUILD.gn ('K') | « media/filters/audio_decoder_unittest_ffmpeg.cc ('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 ca93b36091dcb352d03d691a55c806ba4748b210..29f86273aa9f9030a0aa3aa21348e0e9f19aa7c2 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1304,7 +1304,10 @@
'ffmpeg/ffmpeg_common_unittest.cc',
'filters/audio_clock_unittest.cc',
'filters/audio_decoder_selector_unittest.cc',
+ 'filters/audio_decoder_test.h',
'filters/audio_decoder_unittest.cc',
+ 'filters/audio_decoder_unittest_chromium.cc',
+ 'filters/audio_decoder_unittest_ffmpeg.cc',
'filters/audio_file_reader_unittest.cc',
'filters/audio_renderer_algorithm_unittest.cc',
'filters/blocking_url_protocol_unittest.cc',
@@ -1378,7 +1381,7 @@
}, { # media_use_ffmpeg==0
'sources!': [
'ffmpeg/ffmpeg_common_unittest.cc',
- 'filters/audio_decoder_unittest.cc',
+ 'filters/audio_decoder_unittest_ffmpeg.cc',
'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
'filters/ffmpeg_demuxer_unittest.cc',
'filters/ffmpeg_glue_unittest.cc',
@@ -1399,7 +1402,7 @@
# These tests are confused by Android always having proprietary
# codecs enabled, but ffmpeg_branding=Chromium. These should be
# fixed, see http://crbug.com/570762.
- 'filters/audio_decoder_unittest.cc',
+ 'filters/audio_decoder_unittest_ffmpeg.cc',
'filters/audio_file_reader_unittest.cc',
'filters/ffmpeg_demuxer_unittest.cc',
],
« media/BUILD.gn ('K') | « media/filters/audio_decoder_unittest_ffmpeg.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698