[recipes] Remove build environment vars from default_env

infra/bots/recipes/swarm_perf.py

 # Copyright 2016 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.
 
 
 # Recipe module for Skia Swarming perf.
 
 
 DEPS = [
   'build/file',
@@ skipping 53 matching lines @@
           api.flavor.device_dirs.images_dir, 'nanobench'),
   ]
 
   skip_flag = None
   if api.vars.builder_cfg.get('cpu_or_gpu') == 'CPU':
     skip_flag = '--nogpu'
   elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
     skip_flag = '--nocpu'
   if skip_flag:
     args.append(skip_flag)
-  args.extend(api.vars.nanobench_flags)
+  args.extend(api.vars.builder_spec['nanobench_flags'])
 
   if api.vars.upload_perf_results:
     json_path = api.flavor.device_path_join(
         api.flavor.device_dirs.perf_data_dir,
         'nanobench_%s.json' % api.vars.got_revision)
     args.extend(['--outResultsFile', json_path])
     args.extend(properties)
 
     keys_blacklist = ['configuration', 'role', 'is_trybot']
     args.append('--key')
     for k in sorted(api.vars.builder_cfg.keys()):
       if not k in keys_blacklist:
         args.extend([k, api.vars.builder_cfg[k]])
 
   api.run(api.flavor.step, target, cmd=args,
-                abort_on_failure=False,
-                env=api.vars.default_env)
+          abort_on_failure=False,
+          env=api.vars.default_env)
 
   # See skia:2789.
   if ('Valgrind' in api.vars.builder_name and
       api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU'):
     abandonGpuContext = list(args)
     abandonGpuContext.extend(['--abandonGpuContext', '--nocpu'])
     api.run(api.flavor.step,
-                  '%s --abandonGpuContext' % target,
-                  cmd=abandonGpuContext, abort_on_failure=False,
-                  env=api.vars.default_env)
+            '%s --abandonGpuContext' % target,
+            cmd=abandonGpuContext, abort_on_failure=False,
+            env=api.vars.default_env)
 
   # Copy results to swarming out dir.
   if api.vars.upload_perf_results:
     api.file.makedirs('perf_dir', api.vars.perf_data_dir)
     api.flavor.copy_directory_contents_to_host(
         api.flavor.device_dirs.perf_data_dir,
         api.vars.perf_data_dir)
 
 
 def RunSteps(api):
@@ skipping 78 matching lines @@
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skimage', 'VERSION'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skp', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.platform('win', 64)
   )