diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-10-12 15:52:44 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-12 20:16:22 +0000 |
| commit | d301683716145405c5d86b569cb1142d7166abea (patch) | |
| tree | 5637796b08f8cc305684b23c676f216a573af2db /gn | |
| parent | 71c5393b73d1bc4d82e168ae9a8ad5ef86150748 (diff) | |
GN/Win: support win_toolchain asset?
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Win-MSVC-x86_64-Debug-GN-Trybot
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3246
Change-Id: Ib38d4f16788bc27ad81975a4c1b0a732e5df1de3
Reviewed-on: https://skia-review.googlesource.com/3246
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/BUILD.gn | 16 | ||||
| -rw-r--r-- | gn/win_stamp.py | 11 |
2 files changed, 12 insertions, 15 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 7dc8f472b4..2ced468396 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -54,15 +54,24 @@ config("default") { "NOMINMAX", ] include_dirs = [ + "$windk/VC/include", + # For local builds. "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt", "$windk/../Windows Kits/8.1/Include/shared", "$windk/../Windows Kits/8.1/Include/um", - "$windk/VC/include", + # For builds using win_toolchain asset. + "$windk/win_sdk/Include/10.0.10586.0/shared", + "$windk/win_sdk/Include/10.0.10586.0/ucrt", + "$windk/win_sdk/Include/10.0.10586.0/um", ] lib_dirs = [ + "$windk/VC/lib/amd64", + # For local builds. "$windk/../Windows Kits/10/Lib/10.0.10150.0/ucrt/x64", "$windk/../Windows Kits/8.1/Lib/winv6.3/um/x64", - "$windk/VC/lib/amd64", + # For builds using win_toolchain asset. + "$windk/win_sdk/Lib/10.0.10586.0/ucrt/x64", + "$windk/win_sdk/Lib/10.0.10586.0/um/x64", ] } else { cflags += [ @@ -367,8 +376,7 @@ toolchain("msvc") { } tool("stamp") { - win_stamp_path = rebase_path("win_stamp.py") - command = "python $win_stamp_path {{output}}" + command = "cmd.exe /c echo > {{output}}" } } diff --git a/gn/win_stamp.py b/gn/win_stamp.py deleted file mode 100644 index 3d23dd80a3..0000000000 --- a/gn/win_stamp.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2016 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Implement stamp for windows. - -import sys -open(sys.argv[1], 'w').close() |