V8: Let peek-gn use mb to reuse v8-side configs.

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 559 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):
+             android_version_name=None, gyp_script=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)
@@ skipping 29 matching lines @@
     if android_version_name:
       args += ['--android-version-name=%s' % android_version_name]
 
     if gyp_script:
       args += ['--gyp-script=%s' % gyp_script]
 
     args += [build_dir]
 
     # This runs with an almost-bare env being passed along, so we get a clean
     # environment without any GYP_DEFINES being present to cause confusion.
-    kwargs = {
+    step_kwargs = {
       'name': name or 'generate_build_files',
       'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'),
       'args': args,
       'env': {
         'GOMA_SERVICE_ACCOUNT_JSON_FILE': self.m.goma.service_account_json_path,
       }
     }
     if self.c.env.FORCE_MAC_TOOLCHAIN:
-      kwargs['env']['FORCE_MAC_TOOLCHAIN'] = self.c.env.FORCE_MAC_TOOLCHAIN
+      step_kwargs['env']['FORCE_MAC_TOOLCHAIN'] = (
+        self.c.env.FORCE_MAC_TOOLCHAIN)
 
     if self.c.TARGET_CROS_BOARD:
       # Wrap 'runhooks' through 'cros chrome-sdk'
-      kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True)
+      step_kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True)
 
-    self.m.python(**kwargs)
+    step_kwargs.update(kwargs)
+    self.m.python(**step_kwargs)
 
     # Comes after self.m.python so the log appears in the correct step result.
     result = self.m.step.active_result
     if isolated_targets and result:
       result.presentation.logs['swarming-targets-file.txt'] = (
           sorted_isolated_targets)
 
 
   def update_clang(self):
     # The hooks in DEPS call `update.py --if-needed`, which updates clang by
@@ skipping 113 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'))