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/BUILD.gn | 62 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 17 deletions(-) (limited to 'gn/BUILD.gn') diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 5c2baf08f1..fa2f91d4ab 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -55,17 +55,33 @@ config("default") { ] if (msvc == 2015) { - _include_dirs = [ "$windk/VC/include" ] - } else { # 2017 - _include_dirs = [ "$windk/VC/Tools/MSVC/$win_toolchain_version/include" ] + _include_dirs = [ + "$windk/VC/include", + + # For local builds. + "$windk/../Windows Kits/8.1/Include/shared", + "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt", + "$windk/../Windows Kits/8.1/Include/um", + "$windk/../Windows Kits/8.1/Include/winrt", + + # For builds using win_toolchain asset (currently 2015). + "$windk/win_sdk/Include/10.0.14393.0/shared", + "$windk/win_sdk/Include/10.0.14393.0/ucrt", + "$windk/win_sdk/Include/10.0.14393.0/um", + "$windk/win_sdk/Include/10.0.14393.0/winrt", + ] + } else { + # 2017 + _include_dirs = [ + "$windk/VC/Tools/MSVC/$win_toolchain_version/include", + + # For local builds. + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/shared", + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/ucrt", + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/um", + "$windk/../../../Windows Kits/10/Include/10.0.14393.0/winrt", + ] } - _include_dirs += [ - "$win_sdk/Include/$win_sdk_version/shared", - "$win_sdk/Include/$win_sdk_version/ucrt", - "$win_sdk/Include/$win_sdk_version/um", - "$win_sdk/Include/$win_sdk_version/winrt", - ] - if (is_clang) { foreach(dir, _include_dirs) { cflags += [ @@ -77,19 +93,31 @@ config("default") { include_dirs = _include_dirs } - lib_dirs = [ - "$win_sdk/Lib/$win_sdk_version/ucrt/$target_cpu", - "$win_sdk/Lib/$win_sdk_version/um/$target_cpu", - ] if (msvc == 2015) { + lib_dirs = [ + # For local builds. + "$windk/../Windows Kits/10/Lib/10.0.10150.0/ucrt/$target_cpu", + "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu", + + # For builds using win_toolchain asset (currently 2015). + "$windk/win_sdk/Lib/10.0.14393.0/ucrt/$target_cpu", + "$windk/win_sdk/Lib/10.0.14393.0/um/$target_cpu", + ] + if (target_cpu == "x86") { lib_dirs += [ "$windk/VC/lib" ] } else { lib_dirs += [ "$windk/VC/lib/amd64" ] } - } else { # 2017 - lib_dirs += - [ "$windk/VC/Tools/MSVC/$win_toolchain_version/lib/$target_cpu" ] + } else { + # 2017 + lib_dirs = [ + "$windk/VC/Tools/MSVC/$win_toolchain_version/lib/$target_cpu", + + # For local builds. + "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/ucrt/$target_cpu", + "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/um/$target_cpu", + ] } } else { cflags += [ -- cgit v1.2.3