[Android] Refactor bb_host_steps to prepare for downstream usage.

build/android/buildbot/bb_run_bot.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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 collections
 import copy
 import json
 import os
 import pipes
 import re
 import subprocess
 import sys
 
 import bb_utils
 
 BotConfig = collections.namedtuple(
     'BotConfig', ['bot_id', 'host_obj', 'test_obj'])
 
 HostConfig = collections.namedtuple(
-    'HostConfig', ['host_step_args', 'extra_gyp_defines', 'target_arch'])
+    'HostConfig',
+    ['host_steps', 'extra_args', 'extra_gyp_defines', 'target_arch'])
 
 TestConfig = collections.namedtuple('Tests', ['tests', 'extra_args'])
 
 
 def DictDiff(d1, d2):
   diff = []
   for key in sorted(set(d1.keys() + d2.keys())):
     if key in d1 and d1[key] != d2.get(key):
       diff.append('- %s=%s' % (key, pipes.quote(d1[key])))
     if key in d2 and d2[key] != d1.get(key):
@@ skipping 39 matching lines @@
   """Get a formatted list of commands.
 
   Args:
     options: Options object.
     bot_config: A BotConfig named tuple.
   Returns:
     list of Command objects.
   """
   property_args = bb_utils.EncodeProperties(options)
   commands = [['build/android/buildbot/bb_host_steps.py'] +
-              bot_config.host_obj.host_step_args + property_args]
+              ['--steps=%s' % ','.join(bot_config.host_obj.host_steps)] +
+              property_args + (bot_config.host_obj.extra_args or [])]
 
   test_obj = bot_config.test_obj
   if test_obj:
     run_test_cmd = [
         'build/android/buildbot/bb_device_steps.py', '--reboot'] + property_args
     for test in test_obj.tests:
       run_test_cmd.extend(['-f', test])
     if test_obj.extra_args:
       run_test_cmd.extend(test_obj.extra_args)
     commands.append(run_test_cmd)
   return commands
 
 
 def GetBotStepMap():
-  compile_opt = ['--compile']
-  std_host_tests = ['--host-tests=check_webview_licenses,findbugs']
-  std_build_opts = ['--compile', '--zip-build']
-  std_test_opts = ['--extract-build']
+  compile_step = ['compile']
+  std_host_tests = ['check_webview_licenses', 'findbugs']
+  std_build_steps = ['compile', 'zip_build']
+  std_test_steps = ['extract_build']
   std_tests = ['ui', 'unit']
   flakiness_server = '--upload-to-flakiness-server'
 
   def B(bot_id, host_object, test_object=None):
     return BotConfig(bot_id, host_object, test_object)
 
   def T(tests, extra_args=None):
     return TestConfig(tests, extra_args)
 
-  def H(host_step_args, extra_gyp=None, target_arch=None):
-    return HostConfig(host_step_args, extra_gyp, target_arch)
+  def H(host_steps, extra_args=None, extra_gyp=None, target_arch=None):
+    return HostConfig(host_steps, extra_args, extra_gyp, target_arch)
 
   bot_configs = [
       # Main builders
-      B('main-builder-dbg', H(std_build_opts + std_host_tests)),
-      B('main-builder-rel', H(std_build_opts)),
-      B('main-clang-builder', H(compile_opt, 'clang=1')),
-      B('main-clobber', H(compile_opt)),
-      B('main-tests', H(std_test_opts), T(std_tests, [flakiness_server])),
+      B('main-builder-dbg', H(std_build_steps + std_host_tests)),
+      B('main-builder-rel', H(std_build_steps)),
+      B('main-clang-builder', H(compile_step, extra_gyp='clang=1')),
+      B('main-clobber', H(compile_step)),
+      B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])),
 
       # Other waterfalls
-      B('asan-builder-tests', H(compile_opt, 'asan=1'),
+      B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'),
         T(std_tests, ['--asan'])),
-      B('chromedriver-fyi-tests-dbg', H(std_test_opts),
+      B('chromedriver-fyi-tests-dbg', H(std_test_steps),
         T(['chromedriver'], ['--install=ChromiumTestShell'])),
       B('fyi-builder-dbg',
-        H(std_build_opts + std_host_tests + ['--experimental'])),
-      B('fyi-builder-rel', H(std_build_opts + ['--experimental'])),
-      B('fyi-tests-dbg-ics-gn', H(compile_opt + [ '--experimental']),
+        H(std_build_steps + std_host_tests, ['--experimental'])),
+      B('fyi-builder-rel', H(std_build_steps,  ['--experimental'])),
+      B('fyi-tests-dbg-ics-gn', H(compile_step, [ '--experimental']),
         T(std_tests, ['--experimental', flakiness_server])),
-      B('fyi-tests', H(std_test_opts),
+      B('fyi-tests', H(std_test_steps),
         T(std_tests, ['--experimental', flakiness_server])),
       B('fyi-component-builder-tests-dbg',
-        H(compile_opt, 'component=shared_library'),
+        H(compile_step, extra_gyp='component=shared_library'),
         T(std_tests, ['--experimental', flakiness_server])),
-      B('perf-bisect-builder-tests-dbg', H(['--bisect-perf-regression'])),
-      B('perf-tests-rel', H(std_test_opts), T([], ['--install=ContentShell'])),
-      B('webkit-latest-webkit-tests', H(std_test_opts),
+      B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])),
+      B('perf-tests-rel', H(std_test_steps), T([], ['--install=ContentShell'])),
+      B('webkit-latest-webkit-tests', H(std_test_steps),
         T(['webkit_layout', 'webkit'])),
-      B('webkit-latest-contentshell', H(compile_opt), T(['webkit_layout'])),
-      B('builder-unit-tests', H(compile_opt), T(['unit'])),
+      B('webkit-latest-contentshell', H(compile_step), T(['webkit_layout'])),
+      B('builder-unit-tests', H(compile_step), T(['unit'])),
 
       # Generic builder config (for substring match).
-      B('builder', H(std_build_opts)),
+      B('builder', H(std_build_steps)),
   ]
 
   bot_map = dict((config.bot_id, config) for config in bot_configs)
 
   # These bots have identical configuration to ones defined earlier.
   copy_map = [
       ('lkgr-clobber', 'main-clobber'),
       ('try-builder-dbg', 'main-builder-dbg'),
       ('try-builder-rel', 'main-builder-rel'),
       ('try-clang-builder', 'main-clang-builder'),
@@ skipping 61 matching lines @@
     sys.stdout.flush()
     if options.testing:
       env['BUILDBOT_TESTING'] = '1'
     return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env)
     if return_code != 0:
       return return_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))