Chrome on Android: fix cross-compilation setup.

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 97 matching lines @@
 
   ${GOMA_DIR}/goma_ctl.sh start
   if [ -f ${goma_dir}/goma.key ]; then
     export GOMA_API_KEY_FILE=${GOMA_DIR}/goma.key
   fi
   export GOMA_COMPILER_PROXY_DAEMON_MODE=true
   export GOMA_COMPILER_PROXY_RPC_TIMEOUT_SECS=300
   export PATH=$GOMA_DIR:$PATH
 }
 
-# Temporarily added back when goma disabled
-function old_make {
-  # TODO(michaelbai): how to use ccache in NDK.
-  if [ -n "${USE_CCACHE}" ]; then
-    if [ -e "${PREBUILT_CCACHE_PATH}" ]; then
-      use_ccache_var="$PREBUILT_CCACHE_PATH "
-    else
-      use_ccache_var=""
-    fi
-  fi
-  # Only cross-compile if the build is being done either from Chromium's src/
-  # directory, or through WebKit, in which case the WEBKIT_ANDROID_BUILD
-  # environment variable will be defined. WebKit uses a different directory.
-  if [ -f "$PWD/build/android/envsetup.sh" ] ||
-     [ -n "${WEBKIT_ANDROID_BUILD}" ]; then
-    CC="${use_ccache_var}${CROSS_CC}" CXX="${use_ccache_var}${CROSS_CXX}" \
-    LINK="${CROSS_LINK}" AR="${CROSS_AR}" RANLIB="${CROSS_RANLIB}" \
-      command make $*
-  else
-    command make $*
-  fi
-}
-
 # $@: make args.
 # Use goma if possible; degrades to non-Goma if needed.
 function bb_goma_make {
   # Disable Goma
   # Seems to work on "Android FYI" 
   #  http://build.chromium.org/p/chromium.fyi/builders/Chromium%20Linux%20Android/builds/6421/steps/Compile/logs/stdio
   # and Linux trybots
   #  http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/23995/steps/compile/logs/stdio
   # But not on Android trybots?
   #  http://build.chromium.org/p/tryserver.chromium/builders/android/builds/2136/steps/Compile/logs/stdio
-  old_make -j${JOBS} "$@"
+  make -j${JOBS} "$@"
   return
 
+  # TODO(bulach): to use goma, we should use android_goma_gyp,
+  # and then just:
+  # PATH=$GOMA_DIR make -j${JOBS} "$@"

[Ami GONE FROM CHROMIUM, 2012/03/14 17:13:18]

s/R/R:$PATH/

[bulach, 2012/03/14 17:36:43]

Done.

   bb_setup_goma_internal
 
   if [ "${GOMA_DIR}" = "" ]; then
     make -j${JOBS} "$@"
     return
   fi
 
   HOST_CC=$GOMA_DIR/gcc
   HOST_CXX=$GOMA_DIR/g++
   TARGET_CC=$(/bin/ls $ANDROID_TOOLCHAIN/*-gcc | head -n1)
@@ skipping 44 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
 }