Fix more ninja issues

build/android/buildbot/buildbot_functions.sh

Index: build/android/buildbot/buildbot_functions.sh
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index 1cf31db5941872a3cb810d0faa79ffb5f2cd5994..33ab23661ca2879490098cfb340bbd3729d5ff70 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -65,7 +65,7 @@ function bb_baseline_setup {
   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
 
@@ -94,6 +94,10 @@ function bb_setup_goma_internal {
   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
@@ -158,7 +162,7 @@ function bb_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
@@ -174,7 +178,7 @@ function bb_compile_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}"