Fix more ninja issues

build/android/buildbot/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 47 matching lines @@
   bb_parse_args "$@"
 
   cd $SRC_ROOT
   if [ ! "$BUILDBOT_CLOBBER" = "" ]; then
     NEED_CLOBBER=1
   fi
 
   export GOMA_DIR=/b/build/goma
 
   local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
-  if [ $BUILDTOOL = "ninja" ]; then
+  if [[ $BUILDTOOL = ninja ]]; then
     export GYP_GENERATORS=ninja
   fi
 
   . build/android/envsetup.sh
 
   if [ "$NEED_CLOBBER" -eq 1 ]; then
     echo "@@@BUILD_STEP Clobber@@@"
     # Sdk key expires, delete android folder.
     # crbug.com/145860
     rm -rf ~/.android
     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
 
   # Should be called only after envsetup is done.
   bb_run_gclient_hooks
 }
 
 
 # Setup goma.  Used internally to buildbot_functions.sh.
 function bb_setup_goma_internal {
   export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
   export GOMA_COMPILER_PROXY_DAEMON_MODE=true
   export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300
 
+  echo "Killing old goma processes"
+  ${GOMA_DIR}/goma_ctl.sh stop || true
+  killall compiler_proxy || true
+
   echo "Starting goma"
   ${GOMA_DIR}/goma_ctl.sh ensure_start
   trap bb_stop_goma_internal SIGHUP SIGINT SIGTERM
 }
 
 # Stop goma.
 function bb_stop_goma_internal {
   echo "Stopping goma"
   ${GOMA_DIR}/goma_ctl.sh stop
 }
@@ skipping 44 matching lines @@
 
 # Compile step
 function bb_compile {
   # This must be named 'compile', not 'Compile', for CQ interaction.
   # Talk to maruel for details.
   echo "@@@BUILD_STEP compile@@@"
 
   bb_setup_goma_internal
 
   BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
-  if [ $BUILDTOOL = "ninja" ]; then
+  if [[ $BUILDTOOL = ninja ]]; then
     bb_goma_ninja All
   else
     bb_goma_make
   fi
 
   bb_stop_goma_internal
 }
 
 # Experimental compile step; does not turn the tree red if it fails.
 function bb_compile_experimental {
   # Linking DumpRenderTree appears to hang forever?
   EXPERIMENTAL_TARGETS="android_experimental"
   for target in ${EXPERIMENTAL_TARGETS} ; do
     echo "@@@BUILD_STEP Experimental Compile $target @@@"
     set +e
-    if [ $BUILDTOOL = "ninja" ]; then
+    if [[ $BUILDTOOL = ninja ]]; then
       bb_goma_ninja "${target}"
     else
       bb_goma_make -k "${target}"
     fi
     if [ $? -ne 0 ] ; then
       echo "@@@STEP_WARNINGS@@@"
     fi
     set -e
   done
 }
@@ skipping 110 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP')"
 }