GN Windows build fixes

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/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 
 # These variables need to be args.
@@ skipping 55 matching lines @@
     }
   }
   if (use_cras) {
     defines = [ "USE_CRAS" ]
   }
   if (enable_mpeg2ts_stream_parser) {
     defines += [ "ENABLE_MPEG2TS_STREAM_PARSER" ]
   }
 }
 
-if (is_win) {
-  config("media_dependent_config") {
-    ldflags += [
+config("media_dependent_config") {
+  if (is_win) {

[brettw, 2014/07/18 17:23:00]

For this, I prefer to unconditionally add configs and then make the config do
things or not depending on the platform, since it makes it easier to come by
later and add dependent settings for other platforms.

[DaleCurtis, 2014/07/18 18:24:06]

Acknowledged.

+    ldflags = [
       "/DELAYLOAD:mf.dll",
       "/DELAYLOAD:mfplat.dll",
       "/DELAYLOAD:mfreadwrite.dll",
     ]
   }
 }
 
 if (!linux_link_pulseaudio) {
   # When libpulse is not directly linked, use stubs to allow for dlopening of
   # the binary.
@@ skipping 417 matching lines @@
     "formats/webm/webm_stream_parser.h",
     "formats/webm/webm_tracks_parser.cc",
     "formats/webm/webm_tracks_parser.h",
     "formats/webm/webm_video_client.cc",
     "formats/webm/webm_video_client.h",
     "formats/webm/webm_webvtt_parser.cc",
     "formats/webm/webm_webvtt_parser.h",
   ]
 
   configs += [ ":media_config", ]
+  all_dependent_configs = [ ":media_dependent_config" ]
 
+  cflags = []
   libs = []
   defines = []
   deps = []
 
   include_dirs = [ "." ]
   if (media_use_ffmpeg) {
     deps += [ "//third_party/ffmpeg" ]
     sources += [
       "base/audio_video_metadata_extractor.cc",
       "base/audio_video_metadata_extractor.h",
@@ skipping 249 matching lines @@
     libs += [
       "mf.lib",
       "mfplat.lib",
       "mfreadwrite.lib",
       "mfuuid.lib",
     ]
     cflags += [
       "/wd4267"  # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
                  # http://crbug.com/171009
     ]
-    configs += [ ":media_dependent_config" ]
-    all_dependent_configs = [ ":media_dependent_config" ]
   }
 
   if (proprietary_codecs) {
     sources += [
       "formats/mp2t/es_adapter_video.cc",
       "formats/mp2t/es_adapter_video.h",
       "formats/mp2t/es_parser.h",
       "formats/mp2t/es_parser_adts.cc",
       "formats/mp2t/es_parser_adts.h",
       "formats/mp2t/es_parser_h264.cc",
@@ skipping 641 matching lines @@
       "base/android/java/src/org/chromium/media/ImageFormat.template",
     ]
     inputs = [
       "video/capture/android/imageformat_list.h"
     ]
     package_name = "org/chromium/media"
   }
 
   # TODO(dalecurtis): Finish media_unittests_apk and media_perftests_apk.
 }