Enable AudioDecoder unit tests on Android

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1360 matching lines @@
             'filters/h265_parser_unittest.cc',
           ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }, {  # 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
         ['media_use_ffmpeg==0 or OS=="android"', {
           'sources!': [
             'base/audio_video_metadata_extractor_unittest.cc',
             'base/media_file_checker_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'test/pipeline_integration_test.cc',
             'test/pipeline_integration_test_base.cc',
 
             # 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',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
             'player_android',
           ],
           'sources!': [
@@ skipping 766 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }