GN Windows component build fixes: media

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 826dfb4c321a14de2c8beb03b0eac5818903f726..53f97bffc81400249b62a7cec7cae076c4164d0a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -13,7 +13,7 @@ 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" ]
   }
@@ -37,6 +37,10 @@ config("media_config") {
   }
 }
 
+config("media_implementation") {
+  defines = [ "MEDIA_IMPLEMENTATION" ]
+}
+
 config("media_dependent_config") {
   defines = []
   if (!media_use_libvpx) {
@@ -278,6 +282,7 @@ component("media") {
 
   configs += [
     ":media_config",
+    ":media_implementation",
 
     # TODO(wolenetz): Fix size_t to int trunctaion in win64.
     # See http://crbug.com/171009
@@ -285,6 +290,7 @@ component("media") {
   ]
   all_dependent_configs = [ ":media_dependent_config" ]
 
+  allow_circular_includes_from = []
   cflags = []
   libs = []
   defines = []
@@ -334,14 +340,7 @@ component("media") {
     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",
@@ -359,6 +358,14 @@ component("media") {
       "//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) {
@@ -514,7 +521,10 @@ component("media") {
 # 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" ]
@@ -753,8 +763,10 @@ component("shared_memory_support") {
     "base/vector_math.cc",
     "base/vector_math.h",
   ]
-  configs += [ ":media_config" ]
-  defines = [ "MEDIA_IMPLEMENTATION" ]
+  configs += [
+    ":media_config",
+    ":media_implementation",
+  ]
   deps = [
     "//base",
   ]