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 50 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() {
+  CROSS_CC="$(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)" \

[Ami GONE FROM CHROMIUM, 2012/03/13 19:18:31]

What's the deal w/ firstword (here & below)?
l.53 asserts ANDROID_TOOLCHAIN is a dir; are you worried about the glob matching
multiple files?  Why would the first one be valider than the rest?

[bulach, 2012/03/14 12:59:40]

good point, thanks! :)
probably some legacy leftover, we just had that downstream but I couldn't find
any reason. simplified the lot..

+  CROSS_CXX="$(firstword "${ANDROID_TOOLCHAIN}"/*-g++)" \
+  CROSS_LINK="$(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)" \
+  HOST_CC=`which gcc` \
+  HOST_CXX=`which g++` \
+  HOST_LINK=`which g++` \
+  LIBGCC_FILE_NAME=`${CROSS_CC} -print-libgcc-file-name` \
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}"
 }
 
+android_goma_gyp() {
+  CROSS_CC="$GOMA_DIR/gomacc $(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)" \
+  CROSS_CXX="$GOMA_DIR/gomacc $(firstword "${ANDROID_TOOLCHAIN}"/*-g++)" \
+  CROSS_LINK="$GOMA_DIR/gomacc $(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)" \
+  HOST_CC=$GOMA_DIR/gcc \
+  HOST_CXX=$GOMA_DIR/g++ \
+  HOST_LINK=$GOMA_DIR/g++\
+  LIBGCC_FILE_NAME=`${CROSS_CC} -print-libgcc-file-name` \
+  "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}"
+}
+
 firstword() {

[Peter Beverloo, 2012/03/13 16:23:09]

minor readability nit: maybe define firstword() before it's being used.

[bulach, 2012/03/14 12:59:40]

removed.

   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)"
 
 # 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"
@@ skipping 31 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"