Re-land r22016 "Archive webkit_tests results on android bots if requested"

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
 
 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import constants
 
 
 TESTING = 'BUILDBOT_TESTING' in os.environ
 
 BB_BUILD_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir,
     os.pardir, os.pardir, os.pardir, os.pardir))
 
 CHROME_SRC = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
+# TODO: Figure out how to merge this with pylib.cmd_helper.OutDirectory().
+CHROME_OUT_DIR = os.path.join(CHROME_SRC, 'out')
+
 GOMA_DIR = os.environ.get('GOMA_DIR', os.path.join(BB_BUILD_DIR, 'goma'))
 
 GSUTIL_PATH = os.path.join(BB_BUILD_DIR, 'third_party', 'gsutil', 'gsutil')
 
 def CommandToString(command):
   """Returns quoted command that can be run in bash shell."""
   return ' '.join(map(pipes.quote, command))
 
 
 def SpawnCmd(command, stdout=None, cwd=CHROME_SRC):
@@ skipping 48 matching lines @@
 
 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 step_cmds:
     if step in steps:
       cmd(options)