Move android compile setup into compile buildstep

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 133 matching lines @@
 
 # Build using ninja.
 function bb_goma_ninja {
   echo "Using ninja to build."
   local TARGET=$1
   ninja -C out/$BUILDTYPE -j120 -l20 $TARGET
 }
 
 # Compile step
 function bb_compile {
-  bb_compile_setup
   # This must be named 'compile', not 'Compile', for CQ interaction.
   # Talk to maruel for details.
   echo "@@@BUILD_STEP compile@@@"
+  bb_compile_setup
 
   BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
   if [[ $BUILDTOOL = ninja ]]; then
     bb_goma_ninja All
   else
     bb_goma_make
   fi
 
   bb_stop_goma_internal
 }
@@ skipping 147 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', '')"
 }