[Android] Switch the x86, x64, and mips builders on chromium.android to mb.

scripts/slave/recipe_modules/chromium_android/chromium_config.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.
 
 from recipe_engine.config_types import Path
 from recipe_engine import config as recipe_config
 
 import DEPS
 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
 
@@ skipping 31 matching lines @@
 def component_builder(c):
   c.gyp_env.GYP_DEFINES['component'] = 'shared_library'  # pragma: no cover
 
 @CONFIG_CTX(includes=['base_config', 'default_compiler', 'goma'],
             config_vars={'TARGET_ARCH': 'intel'})
 def x86_builder(c):
   if c.TARGET_ARCH != 'intel':  # pragma: no cover
     raise recipe_config.BadConf(
       'Cannot target x86 with TARGET_ARCH == %s' % c.TARGET_ARCH)
 
+@CONFIG_CTX(includes=['x86_builder', 'mb'])
+def x86_builder_mb(c):
+  pass
+
 @CONFIG_CTX(includes=['base_config', 'default_compiler'],
             config_vars={'TARGET_ARCH': 'mipsel'})
 def mipsel_builder(c):
   if c.TARGET_ARCH != 'mipsel':  # pragma: no cover
     raise recipe_config.BadConf('I dunno what to put in a mips builder!')
 
+@CONFIG_CTX(includes=['mipsel_builder', 'mb'])
+def mipsel_builder_mb(c):
+  pass
+
 @CONFIG_CTX(includes=['main_builder'])
 def dartium_builder(c):
   c.compile_py.default_targets=['chrome_apk', 'content_shell_apk']
 
 @CONFIG_CTX()
 def cronet_builder(c):
   c.gyp_env.GYP_DEFINES['disable_file_support'] = 1
   c.gyp_env.GYP_DEFINES['disable_ftp_support'] = 1
   c.gyp_env.GYP_DEFINES['enable_bidirectional_stream'] = 1
   c.gyp_env.GYP_DEFINES['enable_websockets'] = 0
@@ skipping 10 matching lines @@
 @CONFIG_CTX(includes=['arm_l_builder'])
 def arm_l_builder_lto(c):  # pragma: no cover
   c.gyp_env.GYP_DEFINES['use_lto'] = 1
   c.gyp_env.GYP_DEFINES['component'] = 'shared_library'
 
 @CONFIG_CTX(includes=['arm_l_builder'],
             config_vars={'BUILD_CONFIG': 'Release'})
 def arm_l_builder_rel(c):  # pragma: no cover
   pass
 
-@CONFIG_CTX(includes=['base_config', 'default_compiler', 'goma'],
+@CONFIG_CTX(includes=['base_config', 'default_compiler', 'goma', 'mb'],
             config_vars={'TARGET_ARCH': 'intel', 'TARGET_BITS': 64})
-def x64_builder(c):
+def x64_builder_mb(c):
   if c.TARGET_ARCH != 'intel' or c.TARGET_BITS != 64:
     raise recipe_config.BadConf(
       'Cannot target x64 with TARGET_ARCH == %s, TARGET_BITS == %d'
        % (c.TARGET_ARCH, c.TARGET_BITS))  # pragma: no cover
 
 @CONFIG_CTX(includes=['base_config', 'default_compiler', 'goma'])
 def arm64_builder(c):
   gyp_defs = c.gyp_env.GYP_DEFINES
   gyp_defs['target_arch'] = 'arm64'
 
@@ skipping 81 matching lines @@
   gyp_defs = c.gyp_env.GYP_DEFINES
   gyp_defs['android_webview_telemetry_build'] = 1
 
 @CONFIG_CTX(includes=['main_builder'])
 def cast_builder(c):
   c.gyp_env.GYP_DEFINES['chromecast'] = 1
 
 @CONFIG_CTX()
 def errorprone(c):
   c.gyp_env.GYP_DEFINES['enable_errorprone'] = 1