From f5ab269a9d8168e01b92007716323d90b4de2716 Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Wed, 6 Dec 2017 21:51:23 +0000 Subject: Revert "Always use the Win 10 SDK, and optionally detect/use the latest version" This reverts commit 6da1d32c16a0598e9b32a4e5b60f99aca871a399. Reason for revert: Caused Build-Win-Clang-arm64-Release-Android to fail. Eg: https://chromium-swarm.appspot.com/task?id=3a467f1ddd15fb10&refresh=10 Original change's description: > Always use the Win 10 SDK, and optionally detect/use the latest version > > For bot toolchain builds, we were already using the Win 10 SDK. Local > 2015 builds were using a strange hybrid of Win 10 and Win 8 SDKs. Now > we always use the Win 10 SDK exclusively. > > This adds two new GN arguments: win_sdk, which points at the top level > Windows 10 SDK directory, and win_sdk_version, which can be used to > pin to a specific version. (Otherwise we use a script to detect the > most recent version). > > Bug: skia: > Change-Id: I5aabb5eb9e7f483e3676b67b50356ddd0421cf7d > Reviewed-on: https://skia-review.googlesource.com/81304 > Reviewed-by: Mike Klein > Commit-Queue: Brian Osman TBR=mtklein@chromium.org,borenet@google.com,bungeman@google.com,brianosman@google.com Change-Id: Id044114fc685d570741e3f5ed003c4be2ffa84a3 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/81500 Reviewed-by: Ravi Mistry Commit-Queue: Ravi Mistry --- gn/BUILDCONFIG.gn | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gn/BUILDCONFIG.gn') diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 05dc3573b5..413f660a79 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -37,8 +37,6 @@ declare_args() { windk = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional" win_toolchain_version = "" } - win_sdk = "C:/Program Files (x86)/Windows Kits/10" - win_sdk_version = "" } assert(!(is_debug && is_official_build)) @@ -190,11 +188,6 @@ if (is_win) { [ "$windk/VC/Tools/MSVC" ], "trim string") } - if (win_sdk_version == "") { - win_sdk_version = exec_script("//gn/highest_version_dir.py", - [ "$win_sdk/Include" ], - "trim string") - } # Windows tool chain set_default_toolchain("//gn/toolchain:msvc") -- cgit v1.2.3