diff options
| author |  Ravi Mistry <rmistry@google.com> | 2017-12-06 21:51:23 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-06 21:51:30 +0000 |
| commit | f5ab269a9d8168e01b92007716323d90b4de2716 (patch) | |
| tree | f2642597d1980e721709b6b64d9a25237c04f1d1 /gn/BUILDCONFIG.gn | |
| parent | fadbfcd4aba676d44dfb08de1a83143a1c63b95c (diff) | |
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 <mtklein@chromium.org>
> Commit-Queue: Brian Osman <brianosman@google.com>
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 <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'gn/BUILDCONFIG.gn')
| -rw-r--r-- | gn/BUILDCONFIG.gn | 7 |
1 files changed, 0 insertions, 7 deletions
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") |