Android build: 64-bit linker issues.

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}"
 JOBS="${JOBS:-4}"
 
 # Clobber build?  Overridden by bots with BUILDBOT_CLOBBER.
 NEED_CLOBBER="${NEED_CLOBBER:-0}"
 
+# Setup environment for Android build.
+# Called from bb_baseline_setup.
+# Moved to top of file so it is easier to find.
+function bb_setup_environment {
+  export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux
+  export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
+}
+
+# Install the build deps by running
+# build/install-build-deps-android.sh.  This may update local tools.
+# $1: source root.
+function bb_install_build_deps {
+  echo "@@@BUILD_STEP install build deps android@@@"
+  local script="$1/build/install-build-deps-android.sh"
+  if [[ -f "$script" ]]; then
+    "$script"
+  else
+    echo "Cannot find $script; why?"
+  fi
+}
+
 # Function to force-green a bot.
 function bb_force_bot_green_and_exit {
   echo "@@@BUILD_STEP Bot forced green.@@@"
   exit 0
 }
 
 # Basic setup for all bots to run after a source tree checkout.
 # $1: source root.
 function bb_baseline_setup {
   echo "@@@BUILD_STEP cd into source root@@@"
   SRC_ROOT="$1"
   if [ ! -d "${SRC_ROOT}" ] ; then
     echo "Please specify a valid source root directory as an arg"
     echo '@@@STEP_FAILURE@@@'
     return 1
   fi
   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@@@"
-  export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux
-  export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
+  bb_setup_environment
   for mandatory_directory in "${ANDROID_SDK_ROOT}" "${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
@@ skipping 43 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
 }