Enable AudioDecoder unit tests on Android

media/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
@@ skipping 622 matching lines @@
     "cdm/external_clear_key_test_helper.cc",
     "cdm/external_clear_key_test_helper.h",
     "cdm/json_web_key_unittest.cc",
     "cdm/simple_cdm_allocator.cc",
     "cdm/simple_cdm_allocator.h",
     "cdm/simple_cdm_allocator_unittest.cc",
     "cdm/simple_cdm_buffer.cc",
     "cdm/simple_cdm_buffer.h",
     "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_renderer_algorithm_unittest.cc",
     "filters/chunk_demuxer_unittest.cc",
     "filters/decrypting_audio_decoder_unittest.cc",
     "filters/decrypting_demuxer_stream_unittest.cc",
     "filters/decrypting_video_decoder_unittest.cc",
     "filters/fake_video_decoder.cc",
     "filters/fake_video_decoder.h",
     "filters/fake_video_decoder_unittest.cc",
     "filters/file_data_source_unittest.cc",
     "filters/frame_processor_unittest.cc",
@@ skipping 83 matching lines @@
   }
 
   if (media_use_ffmpeg) {
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
       "filters/blocking_url_protocol_unittest.cc",
       "filters/ffmpeg_glue_unittest.cc",
       "filters/in_memory_url_protocol_unittest.cc",
     ]
 
+    if (!is_android || ffmpeg_branding == "Chrome") {

[Tima Vaisburd, 2016/02/26 20:58:48]

On GYP side ffmpeg_branding seems not defined for use in media and for GYP I
exclude audio_decoder_unittest_ffmpeg.cc for every Android build. Shall we do
the same here for simplicity until http://crbug.com/570762 is fixed?

+      sources += [ "filters/audio_decoder_unittest_ffmpeg.cc" ]
+    }
+
     if (!is_android) {
       sources += [
         # These tests are confused by Android always having proprietary
         # codecs enabled, but ffmpeg_branding=Chromium.  These should be
         # fixed, http://crbug.com/570762.
-        "filters/audio_decoder_unittest.cc",
         "filters/audio_file_reader_unittest.cc",
         "filters/ffmpeg_demuxer_unittest.cc",
 
         # FFmpeg on Android does not include video decoders.
         "filters/ffmpeg_video_decoder_unittest.cc",
       ]
     }
   }
 
   if (current_cpu != "arm" && is_chromeos) {
@@ skipping 176 matching lines @@
 if (proprietary_codecs) {
   fuzzer_test("media_cenc_utils_fuzzer") {
     sources = [
       "cdm/cenc_utils_fuzzertest.cc",
     ]
     deps = [
       ":media",
     ]
   }
 }