Enable goma for Android. Fix non-goma 'make' builds.

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 42 matching lines @@
   cd $SRC_ROOT
 
   if [ ! -f build/android/envsetup.sh ] ; then
     echo "No envsetup.sh"
     echo "@@@STEP_FAILURE@@@"
     return 1
   fi
 
   echo "@@@BUILD_STEP Basic setup@@@"
   bb_setup_environment
-  for mandatory_directory in "${ANDROID_SDK_ROOT}" "${ANDROID_NDK_ROOT}" ; do
+
+  for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \
+    $(dirname "${ANDROID_NDK_ROOT}") ; do
     if [[ ! -d "${mandatory_directory}" ]]; then
       echo "Directory ${mandatory_directory} does not exist."
       echo "Build cannot continue."
       echo "@@@STEP_FAILURE@@@"
       return 1
     fi
   done
 
   if [ ! "$BUILDBOT_CLOBBER" = "" ]; then
     NEED_CLOBBER=1
   fi
 
+  # Setting up a new bot?  Must do this before envsetup.sh
+  if [ ! -d "${ANDROID_NDK_ROOT}" ] ; then
+    bb_install_build_deps $1
+  fi
+
   echo "@@@BUILD_STEP Configure with envsetup.sh@@@"
   . build/android/envsetup.sh
 
   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
 }
 
 
 # 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).
+  if [ -f /usr/local/google/DISABLE_GOMA ]; then
+    echo "@@@STEP_WARNINGS@@@"
+    echo "Goma disabled with a local file"
+    return
+  fi
+
+  goma_dir=${goma_dir:-/b/build/goma}
+  if [ -f ${goma_dir}/goma.key ]; then
+    export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
+  fi
   local goma_ctl=$(which goma_ctl.sh)
   if [ "${goma_ctl}" != "" ]; then
     local goma_dir=$(dirname ${goma_ctl})
   fi
-  goma_dir=${goma_dir:-/b/build/goma}
 
   if [ ! -f ${goma_dir}/goma_ctl.sh ]; then
     echo "@@@STEP_WARNINGS@@@"
     echo "Goma not found on this machine; defaulting to make"
     return
   fi
   export GOMA_DIR=${goma_dir}
   echo "GOMA_DIR: " $GOMA_DIR
 
-  ${GOMA_DIR}/goma_ctl.sh start
-  if [ -f ${goma_dir}/goma.key ]; then
-    export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
-  fi
   export GOMA_COMPILER_PROXY_DAEMON_MODE=true
   export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300
   export PATH=$GOMA_DIR:$PATH
+
+  echo "Starting goma"
+  if [ "$NEED_CLOBBER" -eq 1 ]; then
+    ${GOMA_DIR}/goma_ctl.sh restart
+  else
+    ${GOMA_DIR}/goma_ctl.sh ensure_start
+  fi
+  trap bb_stop_goma_internal SIGHUP SIGINT SIGTERM
+}
+
+# Stop goma.
+function bb_stop_goma_internal {
+  echo "Stopping goma"
+  ${GOMA_DIR}/goma_ctl.sh stop
 }
 
 # $@: make args.
 # Use goma if possible; degrades to non-Goma if needed.
 function bb_goma_make {
-  # Disable Goma
-  # Seems to work on "Android FYI" 
-  #  http://build.chromium.org/p/chromium.fyi/builders/Chromium%20Linux%20Android/builds/6421/steps/Compile/logs/stdio
-  # and Linux trybots
-  #  http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/23995/steps/compile/logs/stdio
-  # But not on Android trybots?
-  #  http://build.chromium.org/p/tryserver.chromium/builders/android/builds/2136/steps/Compile/logs/stdio
-  make -j${JOBS} "$@"
-  return
-
-  # TODO(bulach): to use goma, we need to:
-  # GOMA_DIR=... android_gyp
-  # PATH=$GOMA_DIR:$PATH make -j${JOBS} "$@"
   bb_setup_goma_internal
 
   if [ "${GOMA_DIR}" = "" ]; then
     make -j${JOBS} "$@"
     return
   fi
 
   HOST_CC=$GOMA_DIR/gcc
   HOST_CXX=$GOMA_DIR/g++
   TARGET_CC=$(/bin/ls $ANDROID_TOOLCHAIN/*-gcc | head -n1)
   TARGET_CXX=$(/bin/ls $ANDROID_TOOLCHAIN/*-g++ | head -n1)
   TARGET_CC="$GOMA_DIR/gomacc $TARGET_CC"
   TARGET_CXX="$GOMA_DIR/gomacc $TARGET_CXX"
   COMMON_JAVAC="$GOMA_DIR/gomacc /usr/bin/javac -J-Xmx512M \
     -target 1.5 -Xmaxerrs 9999999"
 
-  make \
+  command make \
     -j100 \
     -l20 \
     HOST_CC="$HOST_CC" \
     HOST_CXX="$HOST_CXX" \
     TARGET_CC="$TARGET_CC" \
     TARGET_CXX="$TARGET_CXX" \
     CC.host="$HOST_CC" \
     CXX.host="$HOST_CXX" \
     CC.target="$TARGET_CC" \
     CXX.target="$TARGET_CXX" \
     LINK.target="$TARGET_CXX" \
     COMMON_JAVAC="$COMMON_JAVAC" \
     "$@"
+
+  bb_stop_goma_internal
 }
 
 # Compile step
 function bb_compile {
   echo "@@@BUILD_STEP Compile@@@"
   bb_goma_make
 }
 
 # Experimental compile step; does not turn the tree red if it fails.
 function bb_compile_experimental {
@@ skipping 14 matching lines @@
 function bb_run_tests_emulator {
   echo "@@@BUILD_STEP Run Tests on an Emulator@@@"
   build/android/run_tests.py -e --xvfb --verbose
 }
 
 # Run tests on an actual device.  (Better have one plugged in!)
 function bb_run_tests {
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }