[Android] Refactor the buildbot scripts to prepare for downstream usage.

build/android/buildbot/bb_utils.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 json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
@@ skipping 11 matching lines @@
 CHROME_SRC = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 GOMA_DIR = os.environ.get('GOMA_DIR', os.path.join(BB_BUILD_DIR, 'goma'))
 
 def CommandToString(command):
   """Returns quoted command that can be run in bash shell."""
   return ' '.join(map(pipes.quote, command))
 
 
-def SpawnCmd(command):
+def SpawnCmd(command, stdout=None):
   """Spawn a process without waiting for termination."""
   print '>', CommandToString(command)
   sys.stdout.flush()
   if TESTING:
     class MockPopen(object):
       @staticmethod
       def wait():
         return 0
     return MockPopen()
-  return subprocess.Popen(command, cwd=CHROME_SRC)
+  return subprocess.Popen(command, cwd=CHROME_SRC, stdout=stdout)
 
 
 def RunCmd(command, flunk_on_failure=True, halt_on_failure=False,
-           warning_code=88):
+           warning_code=88, stdout=None):
   """Run a command relative to the chrome source root."""
-  code = SpawnCmd(command).wait()
+  code = SpawnCmd(command, stdout).wait()
   print '<', CommandToString(command)
   if code != 0:
     print 'ERROR: process exited with code %d' % code
     if code != warning_code and flunk_on_failure:
       buildbot_report.PrintError()
     else:
       buildbot_report.PrintWarning()
     # Allow steps to have both halting (i.e. 1) and non-halting exit codes.
     if code != warning_code and halt_on_failure:
       print 'FATAL %d != %d' % (code, warning_code)
@@ skipping 12 matching lines @@
                     callback=ConvertJson, type='string', default={},
                     help='factory properties in JSON format')
   return parser
 
 
 def EncodeProperties(options):
   return ['--factory-properties=%s' % json.dumps(options.factory_properties),
           '--build-properties=%s' % json.dumps(options.build_properties)]
 
 
-def RunSteps(all_steps, options):
-  if not options.steps:
-    return
-
-  steps = options.steps.split(',')
-  unknown_steps = set(steps) - set(step for step, _ in all_steps)
+def RunSteps(steps, step_cmds, options):
+  unknown_steps = set(steps) - set(step for step, _ in step_cmds)
   if unknown_steps:
     print >> sys.stderr, 'FATAL: Unknown steps %s' % list(unknown_steps)
     sys.exit(1)
 
-  for step, cmd in all_steps:
+  for step, cmd in step_cmds:
     if step in steps:
       cmd(options)