diff options
| author |  bsalomon <bsalomon@google.com> | 2016-09-06 08:40:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-06 08:40:51 -0700 |
| commit | b2be02bb39351ed97e789f7d3e97c7180f72560f (patch) | |
| tree | 2e5e61c5a88e87533362a16030b9563d634277ed | |
| parent | f54c00e817b1c659209fbc65bc584b21bf6be1e1 (diff) | |
Update Windows build to use VULKAN_SDK rather than VK_SDK_PATH
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2318633002
Review-Url: https://codereview.chromium.org/2318633002
| -rw-r--r-- | gyp/gpu.gyp | 2 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/default_flavor.py | 2 | ||||
| -rw-r--r-- | infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index a2909b8024..c548e28f24 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -184,7 +184,7 @@ [ 'skia_os == "win"', { 'variables': { 'vulkan_lib_name': '-lvulkan-1', - 'vulkan_sdk_path' : '<!(echo %VK_SDK_PATH%)', + 'vulkan_sdk_path' : '<!(echo %VULKAN_SDK%)', }, 'include_dirs': [ '<(vulkan_sdk_path)/Include', diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py index 80a0a171df..149403c3ab 100644 --- a/infra/bots/recipe_modules/flavor/default_flavor.py +++ b/infra/bots/recipe_modules/flavor/default_flavor.py @@ -139,7 +139,7 @@ class DefaultFlavorUtils(object): make_cmd = ['python', 'make.py'] self.m.run.run_once(self.bootstrap_win_toolchain) if 'Vulkan' in self.m.vars.builder_name: - env['VK_SDK_PATH'] = self.m.vars.slave_dir.join('win_vulkan_sdk') + env['VULKAN_SDK'] = self.m.vars.slave_dir.join('win_vulkan_sdk') else: make_cmd = ['make'] cmd = make_cmd + [target] diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index f3bd0c024b..e483924f7d 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -100,7 +100,7 @@ "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0", "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan", - "VK_SDK_PATH": "[SLAVE_BUILD]\\win_vulkan_sdk" + "VULKAN_SDK": "[SLAVE_BUILD]\\win_vulkan_sdk" }, "name": "build most" }, |