GN Windows component build fixes: media

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")
 
 source_set("base") {
-  visibility = [ "//media/*" ]
+  # This is part of the media component.
+  visibility = [ "//media" ]
   sources = [
     "audio_block_fifo.cc",
     "audio_block_fifo.h",
     "audio_buffer.cc",
     "audio_buffer.h",
     "audio_buffer_converter.cc",
     "audio_buffer_converter.h",
     "audio_buffer_queue.cc",
     "audio_buffer_queue.h",
     "audio_capturer_source.h",
@@ skipping 156 matching lines @@
     "video_renderer.cc",
     "video_renderer.h",
     "video_rotation.h",
     "video_util.cc",
     "video_util.h",
     "wall_clock_time_source.cc",
     "wall_clock_time_source.h",
     "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 += [
       "audio_video_metadata_extractor.cc",
       "audio_video_metadata_extractor.h",
       "container_names.cc",
       "container_names.h",
       "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" ]
   }
 
   if (enable_browser_cdms) {
     sources += [
       "browser_cdm.cc",
       "browser_cdm.h",
       "browser_cdm_factory.cc",
       "browser_cdm_factory.h",
     ]
   }
 
   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) {
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xext",
 
       # TODO(ajwong): Why does xent get a separate thing in //build/config/linux:BUILD.gn
       #         "//build/config/linux:xdamage",
       #         "//build/config/linux:xfixes",
@@ skipping 31 matching lines @@
       "keyboard_event_counter.h",
     ]
   }
 }
 
 # Minimal media component for media/cast on iOS.
 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") {
   testonly = true
   sources = [
     "fake_audio_render_callback.cc",
     "fake_audio_render_callback.h",
     "fake_audio_renderer_sink.cc",
     "fake_audio_renderer_sink.h",
     "fake_text_track_stream.cc",
@@ skipping 64 matching lines @@
     "video_frame_unittest.cc",
     "video_util_unittest.cc",
     "wall_clock_time_source_unittest.cc",
     "yuv_convert_unittest.cc",
   ]
   configs += [
     "//build/config/compiler:no_size_t_to_int_warning",
     "//media:media_config",
   ]
   deps = [
-    ":base",
     ":test_support",
     "//gpu/command_buffer/common",
+    "//media",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   if (media_use_ffmpeg) {
     sources += [
       "audio_video_metadata_extractor_unittest.cc",
       "media_file_checker_unittest.cc",
     ]
@@ skipping 15 matching lines @@
   sources = [
     "audio_bus_perftest.cc",
     "audio_converter_perftest.cc",
     "run_all_perftests.cc",
     "sinc_resampler_perftest.cc",
     "vector_math_perftest.cc",
     "yuv_convert_perftest.cc",
   ]
   configs += [ "//media:media_config" ]
   deps = [
-    ":base",
     ":test_support",
+    "//media",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   if (media_use_ffmpeg) {
     sources += [ "demuxer_perftest.cc" ]
   }
 
   if (is_android) {
     deps += [ "//ui/gl" ]
   }
 }
 
 if (current_cpu == "x86" || current_cpu == "x64") {
   source_set("media_sse2") {
     sources = [
       "simd/convert_rgb_to_yuv_sse2.cc",
       "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" ]
     }
   }
 
   import("//third_party/yasm/yasm_assemble.gni")
   yasm_assemble("media_yasm") {
     sources = [
       "simd/convert_rgb_to_yuv_ssse3.asm",
       "simd/convert_yuv_to_rgb_sse.asm",
@@ skipping 45 matching lines @@
       if (is_posix) {
         yasm_flags += [ "-DELF" ]
         if (current_cpu == "x64") {
           # TODO(ajwong): Why isn't this true in mac?
           yasm_flags += [ "-DPIC" ]
         }
       }
     }
   }
 }