Run necessary gclient hooks on the Android bots.

build/android/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 45 matching lines @@
     echo "Cannot find $script; why?"
   fi
 }
 
 # Function to force-green a bot.
 function bb_force_bot_green_and_exit {
   echo "@@@BUILD_STEP Bot forced green.@@@"
   exit 0
 }
 
+function bb_run_gclient_hooks {
+  echo "@@@BUILD_STEP runhooks android@@@"
+  gclient runhooks
+}
+
 # Basic setup for all bots to run after a source tree checkout.
 # Args:
 #   $1: source root.
 #   $2 and beyond: key value pairs which are parsed by bb_parse_args.
 function bb_baseline_setup {
   echo "@@@BUILD_STEP cd into source root@@@"
   SRC_ROOT="$1"
   # Remove SRC_ROOT param
   shift
 
@@ skipping 39 matching lines @@
 
   if [ "$NEED_CLOBBER" -eq 1 ]; then
     echo "@@@BUILD_STEP Clobber@@@"
     rm -rf "${SRC_ROOT}"/out
     if [ -e "${SRC_ROOT}"/out ] ; then
       echo "Clobber appeared to fail?  ${SRC_ROOT}/out still exists."
       echo "@@@STEP_WARNINGS@@@"
     fi
   fi
 
-  echo "@@@BUILD_STEP android_gyp@@@"
-  android_gyp
+  # Should be called only after envsetup is done.

[Isaac (away), 2012/07/18 21:30:49]

nit: do we really need a separate bash function / and a buildbot step for this?

[John Grabowski, 2012/07/18 21:42:25]

Isaac; absolutely!  Makes it easier for testing bb_baseline_setup.  Here's an
example:

<edit edit>
. ./buildbot_functions.sh
unset bb_run_gclient_hooks
bb_baseline_setup  # test my changes to this function FAST

[nilesh, 2012/07/18 21:48:07]

Linux also has a separate step for this. This replaces the android_gyp step.

+  bb_run_gclient_hooks
 }
 
 
 # Setup goma.  Used internally to buildbot_functions.sh.
 function bb_setup_goma_internal {
 
   # Quick bail if I messed things up and can't wait for the CQ to
   # flush out.
   # TODO(jrg): remove this condition when things are
   # proven stable (4/1/12 or so).
@@ skipping 151 matching lines @@
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
   extract_exitcode=$?
   if (( $extract_exitcode > 1 )); then
     echo "@@@STEP_WARNINGS@@@"
     return
   fi
   return $extract_exitcode
   )
 }