Improvements to build_command_buffer.py

infra/bots/recipe_modules/flavor/gn_flavor.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.
 
 import default_flavor
 
 """GN flavor utils, used for building Skia with GN."""
 class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
   def _strip_environment(self):
     self.m.vars.default_env = {k: v for (k,v)
                                in self.m.vars.default_env.iteritems()
                                if k in ['PATH']}
 
   def _run(self, title, cmd, env=None, infra_step=False):
     self._strip_environment()
     self.m.run(self.m.step, title, cmd=cmd,
                env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step)
 
   def _py(self, title, script, env=None, infra_step=True):
     self._strip_environment()
     self.m.run(self.m.python, title, script=script,
                env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step)
 
   def build_command_buffer(self):
     self.m.run(self.m.python, 'build command_buffer',
         script=self.m.vars.skia_dir.join('tools', 'build_command_buffer.py'),
         args=[
           '--chrome-dir', self.m.vars.checkout_root,
           '--output-dir', self.m.vars.skia_out.join(self.m.vars.configuration),
-          '--chrome-build-type', self.m.vars.configuration,

[bsalomon, 2016/11/04 15:38:50]

Now the bots use the new default output dir for the command buffer build.

           '--no-sync', '--make-output-dir'])
 
   def compile(self, unused_target, **kwargs):
     """Build Skia with GN."""
     compiler      = self.m.vars.builder_cfg.get('compiler',      '')
     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',            '')
     target_arch   = self.m.vars.builder_cfg.get('target_arch',   '')
 
@@ skipping 98 matching lines @@
     if 'ASAN' == extra_config:
       env[ 'ASAN_OPTIONS'] = 'symbolize=1 detect_leaks=1'
       env[ 'LSAN_OPTIONS'] = 'symbolize=1 print_suppressions=1'
       env['UBSAN_OPTIONS'] = 'symbolize=1 print_stacktrace=1'
 
     if 'MSAN' == extra_config:
       # Find the MSAN-built libc++.
       env['LD_LIBRARY_PATH'] = clang_linux + '/msan'
 
     self._run(name, cmd, env=env)