Switch from build-time to run-time flags for Project Spitzer.

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/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")
 import("//media/media_options.gni")
@@ skipping 39 matching lines @@
     defines += [ "MEDIA_DISABLE_FFMPEG" ]
   }
   if (is_win) {
     ldflags = [
       "/DELAYLOAD:mf.dll",
       "/DELAYLOAD:mfplat.dll",
       "/DELAYLOAD:mfreadwrite.dll",
     ]
   }
   if (media_use_ffmpeg && is_android) {
-    defines += [
-      "ENABLE_MEDIA_PIPELINE_ON_ANDROID",
-      "DISABLE_FFMPEG_VIDEO_DECODERS",
-    ]
+    defines += [ "DISABLE_FFMPEG_VIDEO_DECODERS" ]
   }
 }
 
 if (use_ozone) {
   action("generate_ozone_constructor_list") {
     # Ozone platform objects are auto-generated using similar
     # patterns for naming and classes constructors. Here we build the
     # object MediaOzonePlatform.
     script = "../ui/ozone/generate_constructor_list.py"
 
@@ skipping 637 matching lines @@
 
   # If ExternalClearKey is built, we can test CdmAdapter.
   if (enable_pepper_cdms) {
     sources += [ "cdm/cdm_adapter_unittest.cc" ]
     deps += [ "//media/cdm/ppapi:clearkeycdm" ]
   }
 
   if (media_use_ffmpeg) {
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
-      "filters/audio_decoder_unittest.cc",
-      "filters/ffmpeg_demuxer_unittest.cc",
+      "filters/blocking_url_protocol_unittest.cc",
       "filters/ffmpeg_glue_unittest.cc",
+      "filters/in_memory_url_protocol_unittest.cc",
     ]
 
-    # Even if FFmpeg is enabled we do not want these files on Android.
-    # TODO(watk): Refactor tests that could be made to run on Android.
     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/blocking_url_protocol_unittest.cc",
+        "filters/ffmpeg_demuxer_unittest.cc",
+
+        # FFmpeg on Android does not include video decoders.
         "filters/ffmpeg_video_decoder_unittest.cc",
-        "filters/in_memory_url_protocol_unittest.cc",
       ]
     }
   }
 
   if (current_cpu != "arm" && is_chromeos) {
     sources += [ "filters/h264_bitstream_buffer_unittest.cc" ]
   }
 
   if (proprietary_codecs) {
     sources += [
@@ skipping 130 matching lines @@
   configs += [
     ":media_config",
     ":media_implementation",
   ]
   deps = [
     "//base",
     "//ui/gfx/geometry",
   ]
 }
 
-if (media_use_ffmpeg) {
+# TODO(watk): Refactor tests that could be made to run on Android. See
+# http://crbug.com/570762
+if (media_use_ffmpeg && !is_android) {
   test("ffmpeg_regression_tests") {
     sources = [
       "base/run_all_unittests.cc",
       "ffmpeg/ffmpeg_regression_tests.cc",
     ]
 
     configs += [ "//media:media_config" ]
 
     deps = [
       "//base/test:test_support",
       "//media",
       "//media:test_support",
       "//media/audio:test_support",
       "//media/base:test_support",
       "//media/test:pipeline_integration_tests",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx:test_support",
       "//ui/gfx/geometry",
     ]
   }
 }