GN Windows component build fixes.

chrome/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/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/version.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 if (!is_android) {
   # TODO(GYP) for Windows need to the the reorder-imports step which probably
   # means adding another target and renaming this to chrome_initial like in GYP.
   executable("chrome") {
     # Because the sources list varies so significantly per-platform, generally
     # each platform lists its own files rather than relying on filtering or
     # removing unused files.
     sources = [
       "app/chrome_exe_resource.h",
     ]
+    defines = []
     deps = []
     datadeps = []
 
     # TODO(GYP) mac_bundle_resources, xcode_settings
 
     # TODO(GYP) order_profiling, order_text_section
 
     if (is_win) {
       sources += [
         "$target_gen_dir/chrome_exe_version.rc",
         "//content/app/startup_helper_win.cc",
         "//content/public/common/content_switches.cc",
         "app/chrome_crash_reporter_client.cc",
         "app/chrome_crash_reporter_client.h",
         "app/chrome_exe.rc",
         "app/chrome_exe_main_win.cc",
         "app/chrome_watcher_client_win.cc",
         "app/chrome_watcher_client_win.h",
         "app/chrome_watcher_command_line_win.cc",
         "app/chrome_watcher_command_line_win.h",
         "app/client_util.cc",
         "app/client_util.h",
         "app/kasko_client.cc",
         "app/kasko_client.h",
         "app/signature_validator_win.cc",
         "app/signature_validator_win.h",
         "common/crash_keys.cc",
         "common/crash_keys.h'",
       ]
+
+      if (is_component_build) {
+        # This is necessary to make content_switches compile without DLL
+        # linkage errors in a component build.
+        defines += [ "COMPILE_CONTENT_STATICALLY" ]
+      }
+
       deps += [
         ":chrome_version_resources",
         ":image_pre_reader",
         ":main_dll",
 
         # 'chrome_nacl_win64" TODO(GYP)
         # '../win8/delegate_execute/delegate_execute.gyp:*', TODO(GYP)
         # '../win8/metro_driver/metro_driver.gyp:metro_driver', TODO(GYP)
         "//base",
         "//breakpad:breakpad_handler",
@@ skipping 135 matching lines @@
 
     # TODO(GYP) chrome_pgo_phase on Windows.
   }
 
   if (use_aura) {
     deps += [ "//ui/compositor" ]
   }
 
   #TODO(GYP) add chrome_multiple_dll support
   if (false) {  #chrome_multiple_dll) {
-    defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
+    defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ]
     deps += [ "//content/public/app:browser" ]
   } else {
     deps += [
       ":child_dependencies",
       "//content/public/app:both",
     ]
   }
 
   if (cld_version == 0 || cld_version == 2) {
     deps += [ "//third_party/cld_2" ]
@@ skipping 514 matching lines @@
 
     args = [
       rebase_path(infile, root_build_dir),
       rebase_path(outfile, root_build_dir),
       "-e s/@@NAME@@/$name/",
       "-e s/@@FILENAME@@/$filename/",
       "-e s/@@CONFDIR@@/$confdir/",
     ]
   }
 }