Revert of [Android] Switch chromium.gpu bots to mb.

build/android/buildbot/bb_host_steps.py

 #!/usr/bin/env python
 # 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 os
 import json
 import sys
 
 import bb_utils
@@ skipping 32 matching lines @@
     if not clobber_env:
       print 'Clobbering due to triggered landmines:'
       with open(landmine_path) as f:
         print f.read()
     RunCmd(['rm', '-rf', build_path])
 
   bb_annotations.PrintNamedStep('runhooks')
   RunCmd(['gclient', 'runhooks'], halt_on_failure=True)
 
 
-def GenerateBuildFiles(options):
-  cmd = [SrcPath('tools', 'mb', 'mb.py'),
-         'gen',
-         '-m', options.build_properties['mastername'],
-         '-b', options.build_properties['buildername'],
-         '//out/%s' % options.target]
-  bb_annotations.PrintNamedStep('generate_build_files')
-  RunCmd(cmd, halt_on_failure=True)
-
-
 def Compile(options):
-  if options.run_mb:
-    os.environ['GYP_CHROMIUM_NO_ACTION'] = '1'
-    RunHooks(options.target)
-    GenerateBuildFiles(options)
-  else:
-    RunHooks(options.target)
-
+  RunHooks(options.target)
   cmd = [os.path.join(SLAVE_SCRIPTS_DIR, 'compile.py'),
          '--build-tool=ninja',
          '--compiler=goma',
          '--target=%s' % options.target,
          '--goma-dir=%s' % bb_utils.GOMA_DIR]
   bb_annotations.PrintNamedStep('compile')
   if options.build_targets:
     build_targets = options.build_targets.split(',')
     cmd += ['--build-args', ' '.join(build_targets)]
   RunCmd(cmd, halt_on_failure=True, cwd=DIR_BUILD_ROOT)
@@ skipping 39 matching lines @@
 def GetHostStepsOptParser():
   parser = bb_utils.GetParser()
   parser.add_option('--steps', help='Comma separated list of host tests.')
   parser.add_option('--build-targets', default='',
                     help='Comma separated list of build targets.')
   parser.add_option('--experimental', action='store_true',
                     help='Indicate whether to compile experimental targets.')
   parser.add_option('--extra_src', default='',
                     help='Path to extra source file. If this is supplied, '
                     'bisect script will use it to override default behavior.')
-  parser.add_option('--run-mb', action='store_true',
-                    help='Use mb to generate build files.')
 
   return parser
 
 
 def main(argv):
   parser = GetHostStepsOptParser()
   options, args = parser.parse_args(argv[1:])
   if args:
     return sys.exit('Unused args %s' % args)
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   setattr(options, 'extra_src',
           options.factory_properties.get('extra_src', ''))
 
   if options.steps:
     bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))