Chrome on Android: fix cross-compilation setup.

build/android/envsetup.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.
 
 # Sets up environment for building Chromium on Android. Only Android NDK,
 # Revision 6b on Linux or Mac is offically supported.
 #
 # To run this script, the system environment ANDROID_NDK_ROOT must be set
@@ skipping 52 matching lines @@
   export CHROME_SRC=$(readlink -f .)
 fi
 
 if [ ! -d "${CHROME_SRC}" ]; then
   echo "CHROME_SRC must be set to the path of Chrome source code." >& 2
   return 1
 fi
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
+  GOMA_WRAPPER=""
+  if [[ -d $GOMA_DIR ]]; then
+    GOMA_WRAPPER="$GOMA_DIR/gomacc"
+  fi
+  # Ninja requires "*_target" for target builds.
+  GOMA_WRAPPER=${GOMA_WRAPPER} \
+  CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \
+  CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++) \
+  LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \
+  AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar) \
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}"
 }
 
-firstword() {
-  echo "${1}"
-}
-
-export CROSS_AR="$(firstword "${ANDROID_TOOLCHAIN}"/*-ar)"
-export CROSS_CC="$(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)"
-export CROSS_CXX="$(firstword "${ANDROID_TOOLCHAIN}"/*-g++)"
-export CROSS_LINK="$(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)"
-export CROSS_RANLIB="$(firstword "${ANDROID_TOOLCHAIN}"/*-ranlib)"
-export OBJCOPY="$(firstword "${ANDROID_TOOLCHAIN}"/*-objcopy)"
-export STRIP="$(firstword "${ANDROID_TOOLCHAIN}"/*-strip)"
+export OBJCOPY=$(echo ${ANDROID_TOOLCHAIN}/*-objcopy)
+export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)

[Peter Beverloo, 2012/03/16 17:31:33]

nit: you use "echo" here while using "basename" above, we should probably use
the same way for both.

 
 # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
 # to canonicalize them (remove double '/', remove trailing '/', etc).
 DEFINES="OS=android"
 DEFINES+=" android_build_type=0"  # Currently, Only '0' is supportted.
 DEFINES+=" host_os=${host_os}"
 DEFINES+=" linux_fpic=1"
 DEFINES+=" release_optimize=s"
 DEFINES+=" linux_use_tcmalloc=0"
 DEFINES+=" disable_nacl=1"
@@ skipping 29 matching lines @@
 export GYP_DEFINES="${DEFINES}"
 
 # Use the "android" flavor of the Makefile generator for both Linux and OS X.
 export GYP_GENERATORS="make-android"
 
 # Use our All target as the default
 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
 
 # We want to use our version of "all" targets.
 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"