media: Fix gn deps on media/ targets

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/buildflag_header.gni")
 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")
@@ skipping 59 matching lines @@
     defines += [ "DISABLE_FFMPEG_VIDEO_DECODERS" ]
   }
 }
 
 source_set("cdm_api") {
   sources = [
     "cdm/api/content_decryption_module.h",
   ]
 }
 
+# TODO(jrummell): This should be in media/filters/BUILD.gn (which doesn't
+# currently exist). http://crbug.com/613033
+source_set("filters_common") {
+  sources = [
+    "filters/file_data_source.h",
+  ]
+  if (media_use_ffmpeg) {
+    sources += [
+      "filters/blocking_url_protocol.h",
+      "filters/ffmpeg_glue.h",
+    ]
+  }
+}
+
+# TODO(jrummell): Each subdirectory should have it's own BUILD.gn, and then
+# this component can depend on them.  http://crbug.com/613033
 component("media") {
   sources = [
     "cdm/aes_decryptor.cc",
     "cdm/aes_decryptor.h",
     "cdm/cdm_adapter.cc",
     "cdm/cdm_adapter.h",
     "cdm/cdm_allocator.cc",
     "cdm/cdm_allocator.h",
     "cdm/cdm_file_io.cc",
     "cdm/cdm_file_io.h",
@@ skipping 23 matching lines @@
     "filters/decoder_stream_traits.h",
     "filters/decrypting_audio_decoder.cc",
     "filters/decrypting_audio_decoder.h",
     "filters/decrypting_demuxer_stream.cc",
     "filters/decrypting_demuxer_stream.h",
     "filters/decrypting_video_decoder.cc",
     "filters/decrypting_video_decoder.h",
     "filters/default_media_permission.cc",
     "filters/default_media_permission.h",
     "filters/file_data_source.cc",
-    "filters/file_data_source.h",
     "filters/frame_processor.cc",
     "filters/frame_processor.h",
     "filters/gpu_video_decoder.cc",
     "filters/gpu_video_decoder.h",
     "filters/h264_bit_reader.cc",
     "filters/h264_bit_reader.h",
     "filters/h264_parser.cc",
     "filters/h264_parser.h",
     "filters/ivf_parser.cc",
     "filters/ivf_parser.h",
@@ skipping 98 matching lines @@
 
   allow_circular_includes_from = []
   cflags = []
   libs = []
   defines = []
   deps = [
     ":cdm_api",
   ]
 
   public_configs = [ "//third_party/libwebm:libwebm_config" ]
-  public_deps = []
+  public_deps = [
+    ":filters_common",
+  ]
 
   include_dirs = [ "." ]
   if (media_use_ffmpeg) {
     public_deps += [ "//media/ffmpeg" ]
     deps += [ "//third_party/ffmpeg" ]
     sources += [
       "filters/audio_file_reader.cc",
       "filters/audio_file_reader.h",
       "filters/blocking_url_protocol.cc",
-      "filters/blocking_url_protocol.h",
       "filters/ffmpeg_audio_decoder.cc",
       "filters/ffmpeg_audio_decoder.h",
       "filters/ffmpeg_bitstream_converter.h",
       "filters/ffmpeg_demuxer.cc",
       "filters/ffmpeg_demuxer.h",
       "filters/ffmpeg_glue.cc",
-      "filters/ffmpeg_glue.h",
       "filters/ffmpeg_video_decoder.cc",
       "filters/ffmpeg_video_decoder.h",
       "filters/in_memory_url_protocol.cc",
       "filters/in_memory_url_protocol.h",
     ]
     if (proprietary_codecs) {
       sources += [
         "filters/ffmpeg_aac_bitstream_converter.cc",
         "filters/ffmpeg_aac_bitstream_converter.h",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc",
@@ skipping 586 matching lines @@
   sources = [
     "filters/vpx_video_decoder_fuzzertest.cc",
   ]
   deps = [
     ":media",
     "//base",
   ]
   libfuzzer_options = [ "max_len = 400000" ]
   seed_corpus = "//media/test/data"
 }