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 207 matching lines @@
     "filters/h264_bit_reader.cc",
     "filters/h264_bit_reader.h",
     "filters/h264_parser.cc",
     "filters/h264_parser.h",
     "filters/ivf_parser.cc",
     "filters/ivf_parser.h",
     "filters/jpeg_parser.cc",
     "filters/jpeg_parser.h",
     "filters/media_source_state.cc",
     "filters/media_source_state.h",
+    "filters/opus_audio_decoder.cc",
+    "filters/opus_audio_decoder.h",
     "filters/opus_constants.cc",
     "filters/opus_constants.h",
     "filters/source_buffer_range.cc",
     "filters/source_buffer_range.h",
     "filters/source_buffer_stream.cc",
     "filters/source_buffer_stream.h",
     "filters/stream_parser_factory.cc",
     "filters/stream_parser_factory.h",
     "filters/video_cadence_estimator.cc",
     "filters/video_cadence_estimator.h",
@@ skipping 171 matching lines @@
         current_cpu == "mips64el") {
       sources += [
         "base/android/ndk_media_codec_bridge.cc",
         "base/android/ndk_media_codec_bridge.h",
         "base/android/ndk_media_codec_wrapper.cc",
       ]
     }
     allow_circular_includes_from = [ "//media/base/android" ]
   }
 
-  if (!is_android || media_use_ffmpeg) {
-    sources += [
-      "filters/opus_audio_decoder.cc",
-      "filters/opus_audio_decoder.h",
-    ]
-  }
-
   if (current_cpu != "arm" && is_chromeos) {
     sources += [
       "filters/h264_bitstream_buffer.cc",
       "filters/h264_bitstream_buffer.h",
     ]
   }
 
   # A simple WebM encoder for animated avatars on ChromeOS.
 
   if (use_ozone) {
@@ skipping 295 matching lines @@
 
   # 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) {
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
+      "filters/audio_decoder_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",
     ]
   }
 }