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..7c31248d232cbf9ef32e75435747861c488c6880 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -68,6 +68,26 @@ fi
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
+  CROSS_CC="$(firstword "${ANDROID_TOOLCHAIN}"/*-gcc)" \
+  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=`${ANDROID_TOOLCHAIN}/arm-linux-androideabi-gcc \

[Peter Beverloo, 2012/03/13 14:58:59]

This seems to defeat the purpose of the firstword-searches earlier on in this
function, why can we refer to the binary name directly here, but not in the
previous occurrences?

[bulach, 2012/03/13 15:12:09]

good point, let me fix this..

+                    -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=`${ANDROID_TOOLCHAIN}/arm-linux-androideabi-gcc \
+                    -print-libgcc-file-name` \
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}"
 }
 
@@ -75,11 +95,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)"