GN Windows component build fixes: media

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")
 import("//testing/test.gni")
 
 # Common configuration for targets in the media directory.
 # NOT for exporting.
 config("media_config") {
-  defines = [ "MEDIA_IMPLEMENTATION" ]
+  defines = []
   if (!media_use_libvpx) {
     defines += [ "MEDIA_DISABLE_LIBVPX" ]
   }
   if (!media_use_ffmpeg) {
     defines += [ "MEDIA_DISABLE_FFMPEG" ]
   }
   if (current_cpu == "arm" && arm_use_neon) {
     defines += [ "USE_NEON" ]
   }
   if (use_pulseaudio) {
     defines += [ "USE_PULSEAUDIO" ]
     if (!link_pulseaudio) {
       defines += [ "DLOPEN_PULSEAUDIO" ]
     }
   }
   if (use_cras) {
     defines += [ "USE_CRAS" ]
   }
   if (use_alsa) {
     defines += [ "USE_ALSA" ]
   }
 }
 
+config("media_implementation") {
+  defines = [ "MEDIA_IMPLEMENTATION" ]
+}
+
 config("media_dependent_config") {
   defines = []
   if (!media_use_libvpx) {
     defines += [ "MEDIA_DISABLE_LIBVPX" ]
   }
   if (!media_use_ffmpeg) {
     defines += [ "MEDIA_DISABLE_FFMPEG" ]
   }
   if (is_win) {
     ldflags = [
@@ skipping 221 matching lines @@
     "video/picture.cc",
     "video/picture.h",
     "video/video_decode_accelerator.cc",
     "video/video_decode_accelerator.h",
     "video/video_encode_accelerator.cc",
     "video/video_encode_accelerator.h",
   ]
 
   configs += [
     ":media_config",
+    ":media_implementation",
 
     # TODO(wolenetz): Fix size_t to int trunctaion in win64.
     # See http://crbug.com/171009
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
   all_dependent_configs = [ ":media_dependent_config" ]
 
+  allow_circular_includes_from = []
   cflags = []
   libs = []
   defines = []
   deps = []
 
   include_dirs = [ "." ]
   if (media_use_ffmpeg) {
     deps += [ "//third_party/ffmpeg" ]
     sources += [
       "ffmpeg/ffmpeg_common.cc",
@@ skipping 29 matching lines @@
   }
 
   if (media_use_libvpx) {
     sources += [
       "filters/vpx_video_decoder.cc",
       "filters/vpx_video_decoder.h",
     ]
     deps += [ "//third_party/libvpx" ]
   }
 
-  if (!is_android) {
-    sources += [
-      "filters/opus_audio_decoder.cc",
-      "filters/opus_audio_decoder.h",
-      "renderers/default_renderer_factory.cc",
-      "renderers/default_renderer_factory.h",
-    ]
-  } else {
+  if (is_android) {
     sources += [
       "midi/midi_manager_android.cc",
       "midi/usb_midi_device_android.cc",
       "midi/usb_midi_device_android.h",
       "midi/usb_midi_device_factory_android.cc",
       "midi/usb_midi_device_factory_android.h",
       "video/capture/android/video_capture_device_android.cc",
       "video/capture/android/video_capture_device_android.h",
       "video/capture/android/video_capture_device_factory_android.cc",
       "video/capture/android/video_capture_device_factory_android.h",
     ]
     deps += [
       "//media/base/android",
       "//media/base/android:media_java",
       "//media/base/android:media_jni_headers",
       "//media/base/android:video_capture_jni_headers",
     ]
+    allow_circular_includes_from = [ "//media/base/android" ]

[Dirk Pranke, 2015/04/24 21:54:26]

ick :(.

+  } else {
+    sources += [
+      "filters/opus_audio_decoder.cc",
+      "filters/opus_audio_decoder.h",
+      "renderers/default_renderer_factory.cc",
+      "renderers/default_renderer_factory.h",
+    ]
   }
 
   if (current_cpu != "arm" && is_chromeos) {
     sources += [
       "filters/h264_bitstream_buffer.cc",
       "filters/h264_bitstream_buffer.h",
     ]
   }
 
   if (use_alsa && use_udev) {
@@ skipping 135 matching lines @@
     "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//url",
   ]
 }
 
 # Minimal media component for media/cast on iOS.
 if (is_ios) {
   component("media_for_cast_ios") {
-    configs += [ ":media_config" ]
+    configs += [
+      ":media_config",
+      ":media_implementation",
+    ]
     all_dependent_configs = [ ":media_dependent_config" ]
     include_dirs = [ "." ]
     libs = [ "CoreVideo.framework" ]
 
     deps = [
       ":shared_memory_support",
       "//base",
       "//media/base:base_for_cast_ios",
       "//media/base/mac",
       "//ui/gfx/geometry",
@@ skipping 218 matching lines @@
     "audio/audio_parameters.h",
     "base/audio_bus.cc",
     "base/audio_bus.h",
     "base/channel_layout.cc",
     "base/channel_layout.h",
     "base/limits.h",
     "base/media_export.h",
     "base/vector_math.cc",
     "base/vector_math.h",
   ]
-  configs += [ ":media_config" ]
-  defines = [ "MEDIA_IMPLEMENTATION" ]
+  configs += [
+    ":media_config",
+    ":media_implementation",
+  ]
   deps = [
     "//base",
   ]
 }
 
 if (media_use_ffmpeg) {
   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/geometry",
       "//ui/gfx:test_support",
     ]
   }
 }