2 files changed, 15 insertions, 13 deletions
diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py
index aa8669b3a4..64f35f12ce 100644
--- a/infra/bots/recipe_modules/flavor/default_flavor.py
+++ b/infra/bots/recipe_modules/flavor/default_flavor.py
@@ -126,8 +126,6 @@ class DefaultFlavorUtils(object):
     if self.m.platform.is_win:
       make_cmd = ['python', 'make.py']
       self.m.run.run_once(self.bootstrap_win_toolchain)
-      if 'Vulkan' in self.m.vars.builder_name:
-        env['VULKAN_SDK'] = self.m.vars.slave_dir.join('win_vulkan_sdk')
     else:
       make_cmd = ['make']
     cmd = make_cmd + [target]
@@ -143,17 +141,7 @@ class DefaultFlavorUtils(object):
         raise
 
   def copy_extra_build_products(self, swarming_out_dir):
-    """Copy extra build products to specified directory.
-
-    Copy flavor-specific build products to swarming_out_dir for use in test and
-    perf steps."""
-    if ("Win" in self.m.vars.builder_name and
-        "Vulkan" in self.m.vars.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.m.run.copy_build_products(
-          self.m.path['slave_build'].join('win_vulkan_sdk'),
-          swarming_out_dir)
+    pass
 
   @property
   def out_dir(self):
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index d06d7c4226..78b323dac7 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -23,6 +23,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
       extra_config == 'Mesa',
       extra_config == 'NoGPU',
       extra_config.startswith('SK'),
+      extra_config == 'Vulkan',
       os == 'Ubuntu' and target_arch == 'x86',
     ])
 
@@ -62,6 +63,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
     win_toolchain = str(self.m.vars.slave_dir.join(
       't', 'depot_tools', 'win_toolchain', 'vs_files',
       '95ddda401ec5678f15eeed01d2bee08fcbc5ee97'))
+    win_vulkan_sdk = str(self.m.vars.slave_dir.join('win_vulkan_sdk'))
 
     cc, cxx = None, None
     extra_cflags = []
@@ -107,6 +109,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
       'cc':  cc,
       'cxx': cxx,
       'sanitize': extra_config if 'SAN' in extra_config else '',
+      'skia_vulkan_sdk': win_vulkan_sdk if extra_config == 'Vulkan' else '',
       'target_cpu': 'x86' if target_arch == 'x86' else '',
       'windk': win_toolchain if 'Win' in os else '',
     }.iteritems():
@@ -127,6 +130,17 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
     self._run('ninja', [ninja, '-C', self.out_dir],
               env={'NINJA_STATUS': '%%e [%%f/%%t] '})
 
+  def copy_extra_build_products(self, swarming_out_dir):
+    configuration = self.m.vars.builder_cfg.get('configuration', '')
+    extra_config  = self.m.vars.builder_cfg.get('extra_config',  '')
+    os            = self.m.vars.builder_cfg.get('os',            '')
+
+    win_vulkan_sdk = str(self.m.vars.slave_dir.join('win_vulkan_sdk'))
+    if 'Win' in os and extra_config == 'Vulkan':
+      self.m.run.copy_build_products(
+          win_vulkan_sdk,
+          swarming_out_dir.join('out', configuration + '_x64'))
+
   def step(self, name, cmd, env=None, **kwargs):
     app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
     cmd = [app] + cmd[1:]