Chrome on Android: fix cross-compilation setup.

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 3f4df528c4b3561dfaa4e1fc0e1ccd8b36c9fd61..9314296792823aa807c4ce2b207930b5495ba006 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -68,6 +68,24 @@ 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}"
 }
 
@@ -75,11 +93,6 @@ 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)"