Add Vulkan runtime dll

This gets copied into the out/ dir on compile and allows dm.exe to run anywhere, even if the Vulkan SDK is not installed.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2188543002

Review-Url: https://codereview.chromium.org/2188543002

3 files changed, 41 insertions, 1 deletions

diff --git a/infra/bots/recipe_modules/skia/api.py b/infra/bots/recipe_modules/skia/api.py
index d6c73270db..58d51ec7ec 100644
--- a/infra/bots/recipe_modules/skia/api.py
+++ b/infra/bots/recipe_modules/skia/api.py
@@ -52,6 +52,7 @@ BUILD_PRODUCTS_ISOLATE_WHITELIST = [
   'iOSShell.ipa',
   'visualbench',
   'visualbench.exe',
+  'vulkan-1.dll',
 ]
 
 
diff --git a/infra/bots/recipe_modules/skia/default_flavor.py b/infra/bots/recipe_modules/skia/default_flavor.py
index 11720bea91..3a444e44ba 100644
--- a/infra/bots/recipe_modules/skia/default_flavor.py
+++ b/infra/bots/recipe_modules/skia/default_flavor.py
@@ -152,7 +152,13 @@ class DefaultFlavorUtils(object):
 
     Copy flavor-specific build products to swarming_out_dir for use in test and
     perf steps."""
-    pass
+    if ("Win" in self._skia_api.builder_name and
+        "Vulkan" in self._skia_api.builder_name):
+      # This copies vulkan-1.dll that has been bundled into win_vulkan_sdk
+      # since version 2  See skia/api BUILD_PRODUCTS_ISOLATE_WHITELIST
+      self._skia_api.copy_build_products(
+        self._skia_api.m.path['slave_build'].join('win_vulkan_sdk'),
+        swarming_out_dir)
 
   @property
   def out_dir(self):
diff --git a/infra/bots/recipe_modules/skia/fake_specs.py b/infra/bots/recipe_modules/skia/fake_specs.py
index 776ce40d91..f31da5e97f 100644
--- a/infra/bots/recipe_modules/skia/fake_specs.py
+++ b/infra/bots/recipe_modules/skia/fake_specs.py
@@ -1179,6 +1179,39 @@ FAKE_SPECS = {
     'upload_dm_results': False,
     'upload_perf_results': False,
   },
+  'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan': {
+    'build_targets': [
+      'dm',
+    ],
+    'builder_cfg': {
+      'arch': 'x86_64',
+      'compiler': 'MSVC',
+      'configuration': 'Release',
+      'cpu_or_gpu': 'GPU',
+      'cpu_or_gpu_value': 'GTX660',
+      'extra_config': 'Vulkan',
+      'is_trybot': False,
+      'model': 'ShuttleA',
+      'os': 'Win10',
+      'role': 'Test',
+    },
+    'configuration': 'Release_x64',
+    'dm_flags': [
+      '--dummy-flags',
+    ],
+    'do_perf_steps': False,
+    'do_test_steps': True,
+    'env': {
+      'GYP_DEFINES':
+          ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warn'
+           'ings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp'),
+    },
+    'nanobench_flags': [
+      '--dummy-flags',
+    ],
+    'upload_dm_results': True,
+    'upload_perf_results': False,
+  },
   'Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release': {
     'build_targets': [
       'dm',