[recipes] Fixes for Coverage bot

infra/bots/recipe_modules/vars/api.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.
 
 
 # pylint: disable=W0201
 
 
 from recipe_engine import recipe_api
 import os
@@ skipping 133 matching lines @@
   # Vulkan.
   if builder_dict.get('extra_config') == 'Vulkan':
     gyp_defs['skia_vulkan'] = '1'
     gyp_defs['skia_vulkan_debug_layers'] = '0'
 
   return gyp_defs
 
 
 def get_extra_env_vars(builder_dict):
   env = {}
-  if builder_dict.get('configuration') == 'Coverage':
-    # We have to use Clang 3.6 because earlier versions do not support the
-    # compile flags we use and 3.7 and 3.8 hit asserts during compilation.
-    env['CC'] = '/usr/bin/clang-3.6'
-    env['CXX'] = '/usr/bin/clang++-3.6'
-  elif builder_dict.get('compiler') == 'Clang':
+  if builder_dict.get('compiler') == 'Clang':
     env['CC'] = '/usr/bin/clang'
     env['CXX'] = '/usr/bin/clang++'
 
   # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc.
   extra_config = builder_dict.get('extra_config', '')
   if extra_config.startswith('SK') and extra_config.isupper():
     env['CPPFLAGS'] = '-D' + extra_config  # pragma: no cover
 
   return env
 
@@ skipping 636 matching lines @@
       self.patchset = self.m.properties['patchset']
       self.rietveld = self.m.properties['rietveld']
     self.upload_dm_results = self.builder_spec['upload_dm_results']
     self.upload_perf_results = self.builder_spec['upload_perf_results']
     self.dm_dir = self.m.path.join(
         self.swarming_out_dir, 'dm')
     self.perf_data_dir = self.m.path.join(self.swarming_out_dir,
         'perfdata', self.builder_name, 'data')
     self.dm_flags = self.builder_spec['dm_flags']
     self.nanobench_flags = self.builder_spec['nanobench_flags']