Fix ui/gl and gpu target building with GN on Windows.

Review URL: https://codereview.chromium.org/809783002

Cr-Commit-Position: refs/heads/master@{#309754}

4 files changed, 10 insertions, 28 deletions

diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
index bc2ea88..44a3d70 100644
--- a/build/config/win/BUILD.gn
+++ b/build/config/win/BUILD.gn
@@ -18,8 +18,6 @@ config("sdk") {
     "WIN32",
     "_SECURE_ATL",
   ]
-
-  include_dirs = system_include_dirs
 }
 
 # Sets the default Windows build version. This is separated because some
diff --git a/build/config/win/visual_studio_version.gni b/build/config/win/visual_studio_version.gni
index 24c00cd..6a2828c35 100644
--- a/build/config/win/visual_studio_version.gni
+++ b/build/config/win/visual_studio_version.gni
@@ -20,11 +20,6 @@ declare_args() {
   # This value is the default location, override if you have a different
   # installation location.
   windows_sdk_path = "C:\Program Files (x86)\Windows Kits\8.1"
-
-  # The list of include directories that are treated as "system" include
-  # directories. TODO(scottmg): These are incorrectly put on the command line
-  # in GN, they should really be stored into %INCLUDE%.
-  system_include_dirs = []
 }
 
 if (visual_studio_path == "") {
@@ -42,14 +37,3 @@ if (visual_studio_path == "") {
          "You must set the wdk_path if you set the visual studio path")
   visual_studio_runtime_dirs = []
 }
-
-# The Windows SDK include directories must be first. They both have a sal.h,
-# and the SDK one is newer and the SDK uses some newer features from it not
-# present in the Visual Studio one.
-system_include_dirs = [
-  "$windows_sdk_path\Include\shared",
-  "$windows_sdk_path\Include\um",
-  "$windows_sdk_path\Include\winrt",
-  "$visual_studio_path\VC\include",
-  "$visual_studio_path\VC\atlmfc\include",
-]
diff --git a/build/toolchain/win/midl.gni b/build/toolchain/win/midl.gni
index 9fda96b..ce310d1 100644
--- a/build/toolchain/win/midl.gni
+++ b/build/toolchain/win/midl.gni
@@ -82,13 +82,6 @@ template("midl") {
       idl_target_platform,
       "/Oicf",
     ]
-
-    foreach(include, system_include_dirs) {
-      args += [
-        "/I",
-        include,
-      ]
-    }
   }
 
   source_set(target_name) {
diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
index e8826b0..569f4da 100644
--- a/build/toolchain/win/setup_toolchain.py
+++ b/build/toolchain/win/setup_toolchain.py
@@ -135,9 +135,16 @@ def main():
           vc_bin_dir = os.path.realpath(path)
           break
 
-    # TODO(scottmg|thakis|dpranke): Is there an equivalent to
-    # msvs_system_include_dirs that we need to inject into INCLUDE here?
-
+    # The Windows SDK include directories must be first. They both have a sal.h,
+    # and the SDK one is newer and the SDK uses some newer features from it not
+    # present in the Visual Studio one.
+
+    if win_sdk_path:
+      additional_includes = ('{sdk_dir}\\Include\\shared;' +
+                             '{sdk_dir}\\Include\\um;' +
+                             '{sdk_dir}\\Include\\winrt;').format(
+                                  sdk_dir=win_sdk_path)
+      env['INCLUDE'] = additional_includes + env['INCLUDE']
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.' + arch, 'wb') as f:
       f.write(env_block)