Enable AudioDecoder unit tests on Android

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index ca93b36091dcb352d03d691a55c806ba4748b210..6498e6f54eb00b450eb9bbf600a0781676100f6c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1378,13 +1378,20 @@
         }, {  # media_use_ffmpeg==0
           'sources!': [
             'ffmpeg/ffmpeg_common_unittest.cc',
-            'filters/audio_decoder_unittest.cc',
             'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
           ],
         }],
+        ['media_use_ffmpeg==0 and OS!="android"', {

[DaleCurtis, 2016/02/26 23:31:42]

Just deleting l.1402 and leaving l.1381 should be sufficient.

[Tima Vaisburd, 2016/02/29 23:07:14]

Done, see the comment to the corresponding BUILD.gn change

+          'sources!': [
+             # This file disables FFmpeg decoder tests on Android, thus on Android
+             # we can always include it.
+             # FFmpeg tests should be eventially reenabled, http://crbug.com/570762.
+            'ffmpeg/audio_decoder_unittest.cc',
+          ]
+        }],
         # Even if FFmpeg is enabled on Android we don't want these.
         # TODO(watk): Refactor tests that could be made to run on Android. See
         # http://crbug.com/570762
@@ -1399,7 +1406,6 @@
             # 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_file_reader_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
           ],