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 /infra/bots | |
| 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 'infra/bots')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 4 | ||||
| -rw-r--r-- | infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 5742319764..36027375bb 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -57,7 +57,9 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): target_arch = self.m.vars.builder_cfg.get('target_arch', '') clang_linux = str(self.m.vars.slave_dir.join('clang_linux')) - win_toolchain = str(self.m.vars.slave_dir.join('t')) + win_toolchain = str(self.m.vars.slave_dir.join( + 't', 'depot_tools', 'win_toolchain', 'vs_files', + '95ddda401ec5678f15eeed01d2bee08fcbc5ee97')) cc, cxx = None, None extra_cflags = [] diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json index 49a9c7a749..f3ccd72aa9 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -136,7 +136,7 @@ "gn.bat", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN\\Release", - "--args=is_debug=false target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\"" + "--args=is_debug=false target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { |