Misc fixes for the ChromeOS and Win x64 GN builds.

TBR=brettw@chromium.org BUG= Review URL: https://codereview.chromium.org/1098223003 Cr-Commit-Position: refs/heads/master@{#326235}
Denger-Network · Apr 22, 2015 · 1562114 · 1562114
1 parent 8ccde8a
commit 1562114
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -741,6 +741,9 @@ if (!is_android) {
         deps += [
           #'chrome.gyp:chrome_nacl_win64',  TODO(GYP)
         ]
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
       }
       if (is_linux) {
         deps += [
@@ -1143,6 +1146,9 @@ if (!is_android) {
         "//third_party/wtl",
         "//ui/resources",
       ]
+      configs -= [ "//build/config/win:default_incremental_linking" ]
+      configs +=
+          [ "//build/config/win:default_large_module_incremental_linking" ]
     } else {
       sources -= [ "../app/chrome_version.rc.version" ]
     }
@@ -1730,7 +1736,11 @@ if (!is_android) {
         "//testing/perf",
       ]
 
-      if (!is_win) {
+      if (is_win) {
+        configs -= [ "//build/config/win:default_incremental_linking" ]
+        configs +=
+            [ "//build/config/win:default_large_module_incremental_linking" ]
+      } else {
         sources -= [
           "../app/chrome_command_ids.h",
 

diff --git a/components/user_manager/BUILD.gn b/components/user_manager/BUILD.gn
@@ -38,6 +38,7 @@ component("user_manager") {
       "user_type.h",
     ]
     deps += [
+      "//base:prefs",
       "//chromeos:chromeos",
       "//components/session_manager/core",
       "//google_apis",

diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
@@ -184,6 +184,7 @@ if (!is_mac) {
       deps += [
         "//remoting/codec:unit_tests",
         "//remoting/host:unit_tests",
+        "//ui/gfx",
       ]
     }
 

diff --git a/remoting/host/it2me/BUILD.gn b/remoting/host/it2me/BUILD.gn
@@ -45,6 +45,7 @@ if (!is_win && enable_remoting_host) {
       "//remoting/host",
       "//remoting/host/native_messaging",
       "//remoting/proto",
+      "//ui/gfx",
     ]
 
     if (enable_webrtc) {