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

media/base/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/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
@@ skipping 372 matching lines @@
     "audio_renderer_mixer_unittest.cc",
     "audio_shifter_unittest.cc",
     "audio_splicer_unittest.cc",
     "audio_timestamp_helper_unittest.cc",
     "bind_to_current_loop_unittest.cc",
     "bit_reader_unittest.cc",
     "callback_holder.h",
     "callback_holder_unittest.cc",
     "channel_mixer_unittest.cc",
     "channel_mixing_matrix_unittest.cc",
+    "container_names_unittest.cc",
     "data_buffer_unittest.cc",
     "decoder_buffer_queue_unittest.cc",
     "decoder_buffer_unittest.cc",
     "djb2_unittest.cc",
     "fake_demuxer_stream_unittest.cc",
     "gmock_callback_support_unittest.cc",
     "key_systems_unittest.cc",
     "mime_util_unittest.cc",
     "moving_average_unittest.cc",
     "multi_channel_resampler_unittest.cc",
@@ skipping 33 matching lines @@
 
   # Even if FFmpeg is enabled on Android we don't want these.
   # TODO(watk): Refactor tests that could be made to run on Android.
   if (media_use_ffmpeg && !is_android) {
     sources += [
       "audio_video_metadata_extractor_unittest.cc",
       "media_file_checker_unittest.cc",
     ]
   }
 
-  if (!is_android) {
-    sources += [ "container_names_unittest.cc" ]
-  } else {
+  if (is_android) {
     deps += [ "//ui/gl" ]
   }
 
   if (current_cpu == "x86" || current_cpu == "x64") {
     sources += [ "simd/convert_rgb_to_yuv_unittest.cc" ]
   }
 }
 
 source_set("perftests") {
   testonly = true
@@ skipping 77 matching lines @@
       if (is_posix) {
         yasm_flags += [ "-DELF" ]
         if (current_cpu == "x64") {
           # TODO(ajwong): Why isn't this true in mac?
           yasm_flags += [ "-DPIC" ]
         }
       }
     }
   }
 }