[recipes] Remove build environment vars from default_env

infra/bots/recipe_modules/flavor/android_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
 
 
 import copy
 import default_flavor
@@ skipping 61 matching lines @@
     self.serial = None
     self.serial_args = []
     try:
       path_to_adb = self.m.step(
           'which adb',
           cmd=['which', 'adb'],
           stdout=self.m.raw_io.output(),
           infra_step=True).stdout.rstrip()
     except self.m.step.StepFailure:
       path_to_adb = self.m.path.join(self._android_sdk_root,
-                                               'platform-tools', 'adb')
+                                     'platform-tools', 'adb')
     self._adb = _ADBWrapper(
         self.m, path_to_adb, self.serial_args, self)
     self._default_env = {'ANDROID_SDK_ROOT': self._android_sdk_root,
                          'ANDROID_HOME': self._android_sdk_root,
                          'SKIA_ANDROID_VERBOSE_SETUP': 1}
 
   def step(self, name, cmd, env=None, **kwargs):
     self._adb.maybe_wait_for_device()
     args = [
         self.android_bin.join('android_run_skia'),
         '--verbose',
         '--logcat',
         '-d', self.device,
     ] + self.serial_args + [
         '-t', self.m.vars.configuration,
     ]
     env = dict(env or {})
     env.update(self._default_env)
 
     return self.m.run(self.m.step, name=name, cmd=args + cmd,
                               env=env, **kwargs)
 
-  def compile(self, target):
+  def compile(self, target, **kwargs):
     """Build the given target."""
-    env = dict(self._default_env)
+    env = kwargs.pop('env', {})
+    env.update(dict(self._default_env))
     ccache = self.m.run.ccache()
     if ccache:
       env['ANDROID_MAKE_CCACHE'] = ccache
 
     cmd = [self.android_bin.join('android_ninja'), target, '-d', self.device]
     if 'Clang' in self.m.vars.builder_name:
       cmd.append('--clang')
     if 'GCC' in self.m.vars.builder_name:
       cmd.append('--gcc')
     if 'Vulkan' in self.m.vars.builder_name:
       cmd.append('--vulkan')
     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)
 
   def device_path_join(self, *args):
     """Like os.path.join(), but for paths on a connected Android device."""
     return '/'.join(args)
 
   def device_path_exists(self, path):
     """Like os.path.exists(), but for paths on a connected device."""
     exists_str = 'FILE_EXISTS'
     return exists_str in self._adb(
         name='exists %s' % self.m.path.basename(path),
@@ skipping 172 matching lines @@
                      infra_step=True).stdout.rstrip()
 
   def remove_file_on_device(self, path, *args, **kwargs):
     """Delete the given file."""
     return self._adb(name='rm %s' % self.m.path.basename(path),
                      serial=self.serial,
                      cmd=['shell', 'rm', '-f', path],
                      infra_step=True,
                      *args,
                      **kwargs)