Reland "Change PGO recipe to use MB now that it supports multiple phases."

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 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 re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
@@ skipping 497 matching lines @@
       env.update(self.c.gyp_env.as_jsonish())
 
     if self.c.project_generator.tool != 'gyp':
       env['GYP_CHROMIUM_NO_ACTION'] = 1
     kwargs['env'] = env
     if self.c.TARGET_CROS_BOARD:
       # Wrap 'runhooks' through 'cros chrome-sdk'
       kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True)
     self.m.gclient.runhooks(**kwargs)
 
-  def run_gyp_chromium(self):
+  # No cover because internal recipes use this.
+  def run_gyp_chromium(self): # pragma: no cover
     gyp_chromium_path = self.m.path['checkout'].join('build', 'gyp_chromium.py')
     env = self.get_env()
     env.update(self.c.gyp_env.as_jsonish())
     self.m.python(name='gyp_chromium', script=gyp_chromium_path, env=env);
 
   def run_gn(self, use_goma=False, gn_path=None, build_dir=None, **kwargs):
     if not gn_path:
       gn_path = self.m.path['depot_tools'].join('gn.py')
 
     gn_args = list(self.c.gn_args)
@@ skipping 41 matching lines @@
         '--args=%s' % ' '.join(gn_args),
     ]
     if str(gn_path).endswith('.py'):
       self.m.python(name='gn', script=gn_path, args=step_args, **kwargs)
     else:
       self.m.step(name='gn', cmd=[gn_path] + step_args, **kwargs)
 
   def run_mb(self, mastername, buildername, use_goma=True,
              mb_config_path=None, isolated_targets=None, name=None,
              build_dir=None, android_version_code=None,
-             android_version_name=None, gyp_script=None, **kwargs):
+             android_version_name=None, gyp_script=None, phase=None,
+             **kwargs):
     mb_config_path = (mb_config_path or
                       self.m.path['checkout'].join('tools', 'mb',
                                                    'mb_config.pyl'))
     isolated_targets = isolated_targets or []
 
     out_dir = 'out'
     if self.c.TARGET_CROS_BOARD:
       out_dir += '_%s' % self.c.TARGET_CROS_BOARD
 
     build_dir = build_dir or '//%s/%s' % (out_dir, self.c.build_config_fs)
 
     args=[
         'gen',
         '-m', mastername,
         '-b', buildername,
         '--config-file', mb_config_path,
     ]
 
+    if phase is not None:
+      args += [ '--phase', str(phase) ]
+
     if use_goma:
       goma_dir = self.c.compile_py.goma_dir
       if not goma_dir:
         # This method defaults to use_goma=True, which doesn't necessarily
         # match build-side configuration. However, MB is configured
         # src-side, and so it might be actually using goma.
         self.ensure_goma()
         goma_dir = self.c.compile_py.goma_dir
       if not goma_dir:  # pragma: no cover
         # TODO(phajdan.jr): remove fallback when we always use cipd for goma.
@@ skipping 175 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))