Fix android compile step to respect target config

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 141 matching lines @@
 # $@: make args.
 # Use goma if possible; degrades to non-Goma if needed.
 function bb_goma_make {
   bb_setup_goma_internal
 
   if [ "${GOMA_DIR}" = "" ]; then
     make -j${JOBS} "$@"
     return
   fi
 
+  BUILDTYPE=$(bb_get_json_prop "$FACTORY_PROPERTIES" target)
   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"
 
   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" \
+    BUILDTYPE="$BUILDTYPE" \
     "$@"
 
   local make_exit_code=$?
   bb_stop_goma_internal
   return $make_exit_code
 }
 
 # Compile step
 function bb_compile {
   # This must be named 'compile', not 'Compile', for CQ interaction.
@@ skipping 17 matching lines @@
   done
 }
 
 # Run tests on an emulator.
 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 {
+function bb_run_unit_tests {
   python build/android/device_status_check.py
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }
 
 # Run instrumentation test.
 # Args:
 #   $1: TEST_APK.
 #   $2: EXTRA_FLAGS to be passed to run_instrumentation_tests.py.
 function bb_run_instrumentation_test {
   local TEST_APK=${1}
   local EXTRA_FLAGS=${2}
   local APK_NAME=$(basename ${TEST_APK})
   echo "@@@BUILD_STEP Android Instrumentation ${APK_NAME} ${EXTRA_FLAGS} "\
        "on actual hardware@@@"
   local INSTRUMENTATION_FLAGS="-vvv"
   INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}"
   INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}"
   build/android/run_instrumentation_tests.py ${INSTRUMENTATION_FLAGS}
 }
 
 # Run content shell instrumentation test on device.
-function bb_run_content_shell_instrumentation_test {
+function bb_run_instrumentation_tests {
   build/android/adb_install_content_shell
   local TEST_APK="content_shell_test/ContentShellTest-debug"
   # Use -I to install the test apk only on the first run.
   # TODO(bulach): remove the second once we have a Smoke test.
   bb_run_instrumentation_test ${TEST_APK} "-I -A Smoke"
   bb_run_instrumentation_test ${TEST_APK} "-I -A SmallTest"
   bb_run_instrumentation_test ${TEST_APK} "-A MediumTest"
   bb_run_instrumentation_test ${TEST_APK} "-A LargeTest"
 }
 
@@ skipping 57 matching lines @@
   set +e
   cd "${SRC_ROOT}"
   python android_webview/tools/webview_licenses.py scan
   local license_exit_code=$?
   if [[ license_exit_code -ne 0 ]]; then
     echo "@@@STEP_FAILURE@@@"
   fi
   return $license_exit_code
   )
 }
+
+# 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')['$PROP']"
+}