[recipes] Remove build environment vars from default_env

infra/bots/recipe_modules/flavor/default_flavor.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # pylint: disable=W0201
 
 
 """Default flavor utils class, used for desktop builders."""
 
@@ skipping 93 matching lines @@
         'bootstrap_win_toolchain_json.py')
     win_toolchain_json = self._win_toolchain_dir.join(
         'src', 'build', 'win_toolchain.json')
     self.m.python(
         'bootstrap win toolchain',
         script=bootstrap_script,
         args=['--win_toolchain_json', win_toolchain_json,
               '--depot_tools_parent_dir',
               self._win_toolchain_dir])
 
-  def build_command_buffer(self):
+  def build_command_buffer(self, **kwargs):
     """Build command_buffer."""
     script = self.m.vars.skia_dir.join('tools', 'build_command_buffer.py')
     self.m.run(
         self.m.python, 'build command_buffer',
         script=script,
         args=['--chrome-dir', self.m.vars.checkout_root,
               '--output-dir', self.out_dir,
               '--chrome-build-type', self.m.vars.configuration,
-              '--no-sync'])
+              '--no-sync'],
+        **kwargs)
 
-  def compile(self, target):
+  def compile(self, target, **kwargs):
     """Build the given target."""
+    env = kwargs.pop('env', {})
     # The CHROME_PATH environment variable is needed for builders that use
     # toolchains downloaded by Chrome.
-    env = {'CHROME_PATH': self.chrome_path}
+    env['CHROME_PATH'] = self.chrome_path
     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['VK_SDK_PATH'] = self.m.vars.slave_dir.join('win_vulkan_sdk')
     else:
       make_cmd = ['make']
     cmd = make_cmd + [target]
     try:
       self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
-                       env=env, cwd=self.m.path['checkout'])
+                 env=env, cwd=self.m.path['checkout'], **kwargs)
     except self.m.step.StepFailure:
       if self.m.platform.is_win:
         # The linker occasionally crashes on Windows. Try again.
         self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
-                         env=env, cwd=self.m.path['checkout'])
+                   env=env, cwd=self.m.path['checkout'], **kwargs)
       else:
         raise
     if 'CommandBuffer' in self.m.vars.builder_name:
-      self.m.run.run_once(self.build_command_buffer)
+      self.m.run.run_once(self.build_command_buffer, env=env)
 
   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
@@ skipping 63 matching lines @@
         images_dir=self.m.vars.images_dir,
         skp_dir=self.m.vars.local_skp_dir,
         tmp_dir=self.m.vars.tmp_dir)
 
   def cleanup_steps(self):
     """Run any device-specific cleanup steps."""
     pass
 
   def __repr__(self):
     return '<%s object>' % self.__class__.__name__  # pragma: no cover