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 717 matching lines @@
       "//ui/android:ui_java",
     ]
   }
 
   # If ExternalClearKey is built, we can test CdmAdapter.
   if (enable_pepper_cdms) {
     sources += [ "cdm/cdm_adapter_unittest.cc" ]
     data_deps += [ "//media/cdm/ppapi:clearkeycdm" ]
   }
 
+  if (media_use_ffmpeg || is_android) {

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

Just add the file after l.751

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

Done. This makes audio_decoder_unittest available on Android only if
media_use_ffmpeg is set, and on Android these test do not require ffmpeg at all!
I hope I understood your intention correctly.

+    sources += [
+      # This file disables FFmpeg decoder tests on Android.
+      # FFmpeg tests should be eventially reenabled, http://crbug.com/570762.
+      "filters/audio_decoder_unittest.cc",
+    ]
+  }
+
   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) {
       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",
     ]
   }
 }