GN Windows component build fixes: media

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg
TBR=dpranke@chromium.org

Review URL: https://codereview.chromium.org/1095333004

Cr-Commit-Position: refs/heads/master@{#326916}

5 files changed, 86 insertions, 46 deletions

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 826dfb4..53f97bf 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" ]
+  } 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",
   ]
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index efdad90..d2bbbd3 100644
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -115,7 +115,10 @@ source_set("audio") {
   ]
   deps = []
   libs = []
-  configs += [ "//media:media_config" ]
+  configs += [
+    "//media:media_config",
+    "//media:media_implementation",
+  ]
 
   if (is_mac) {
     sources += [
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index 1f05d4467..8a50fbe 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -10,7 +10,8 @@ import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
 
 source_set("base") {
-  visibility = [ "//media/*" ]
+  # This is part of the media component.
+  visibility = [ "//media" ]
   sources = [
     "audio_block_fifo.cc",
     "audio_block_fifo.h",
@@ -187,12 +188,19 @@ source_set("base") {
     "yuv_convert.cc",
     "yuv_convert.h",
   ]
+
+  allow_circular_includes_from = []
   defines = []
+  public_deps = []
   deps = [
+    "//ui/events:events_base",
     "//skia",
   ]
   libs = []
-  configs += [ "//media:media_config" ]
+  configs += [
+    "//media:media_config",
+    "//media:media_implementation",
+  ]
 
   if (media_use_ffmpeg) {
     sources += [
@@ -203,6 +211,12 @@ source_set("base") {
       "media_file_checker.cc",
       "media_file_checker.h",
     ]
+    if (is_win) {
+      sources += [ "media_win.cc" ]
+    } else if (is_posix) {
+      sources += [ "media_posix.cc" ]
+    }
+
     deps += [ "//third_party/ffmpeg" ]
   }
 
@@ -217,10 +231,13 @@ source_set("base") {
 
   if (is_android) {
     sources += [ "media_stub.cc" ]
-  } else if (is_win) {
-    sources += [ "media_win.cc" ]
-  } else if (is_posix) {
-    sources += [ "media_posix.cc" ]
+    public_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" ]
   }
 
   if (is_linux && use_x11) {
@@ -272,28 +289,30 @@ config("base_for_cast_ios_dependent_config") {
   defines = [ "MEDIA_FOR_CAST_IOS" ]
 }
 
-source_set("base_for_cast_ios") {
-  sources = [
-    "simd/convert_rgb_to_yuv.h",
-    "simd/convert_rgb_to_yuv_c.cc",
-    "simd/convert_yuv_to_rgb.h",
-    "simd/convert_yuv_to_rgb_c.cc",
-    "simd/filter_yuv.h",
-    "simd/filter_yuv_c.cc",
-    "video_frame.cc",
-    "video_frame.h",
-    "video_frame_metadata.cc",
-    "video_frame_metadata.h",
-    "video_util.cc",
-    "video_util.h",
-    "yuv_convert.cc",
-    "yuv_convert.h",
-  ]
-  configs += [
-    "//build/config/compiler:no_size_t_to_int_warning",
-    "//media:media_config",
-  ]
-  all_dependent_configs = [ ":base_for_cast_ios_dependent_config" ]
+if (is_ios) {
+  source_set("base_for_cast_ios") {
+    sources = [
+      "simd/convert_rgb_to_yuv.h",
+      "simd/convert_rgb_to_yuv_c.cc",
+      "simd/convert_yuv_to_rgb.h",
+      "simd/convert_yuv_to_rgb_c.cc",
+      "simd/filter_yuv.h",
+      "simd/filter_yuv_c.cc",
+      "video_frame.cc",
+      "video_frame.h",
+      "video_frame_metadata.cc",
+      "video_frame_metadata.h",
+      "video_util.cc",
+      "video_util.h",
+      "yuv_convert.cc",
+      "yuv_convert.h",
+    ]
+    configs += [
+      "//build/config/compiler:no_size_t_to_int_warning",
+      "//media:media_config",
+    ]
+    all_dependent_configs = [ ":base_for_cast_ios_dependent_config" ]
+  }
 }
 
 source_set("test_support") {
@@ -378,9 +397,9 @@ source_set("unittests") {
     "//media:media_config",
   ]
   deps = [
-    ":base",
     ":test_support",
     "//gpu/command_buffer/common",
+    "//media",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
@@ -416,8 +435,8 @@ source_set("perftests") {
   ]
   configs += [ "//media:media_config" ]
   deps = [
-    ":base",
     ":test_support",
+    "//media",
     "//testing/gmock",
     "//testing/gtest",
   ]
@@ -438,7 +457,10 @@ if (current_cpu == "x86" || current_cpu == "x64") {
       "simd/convert_rgb_to_yuv_ssse3.cc",
       "simd/filter_yuv_sse2.cc",
     ]
-    configs += [ "//media:media_config" ]
+    configs += [
+      "//media:media_config",
+      "//media:media_implementation",
+    ]
     if (!is_win) {
       cflags = [ "-msse2" ]
     }
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
index f6f910e..6108389 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -45,11 +45,13 @@ source_set("android") {
     "webaudio_media_codec_bridge.h",
     "webaudio_media_codec_info.h",
   ]
-  configs += [ "//media:media_config" ]
+  configs += [
+    "//media:media_config",
+    "//media:media_implementation",
+  ]
   deps = [
     ":media_jni_headers",
     "//media:shared_memory_support",
-    "//media/base",
     "//third_party/widevine/cdm:version_h",
     "//ui/gl",
     "//url",
diff --git a/media/media.gyp b/media/media.gyp
index 07c2b7a..e4518de 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1654,6 +1654,7 @@
           ],
         },
         {
+          # GN version: //media/base:media_sse2
           'target_name': 'media_sse2',
           'type': 'static_library',
           'cflags': [