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 5d2108951540b496f84c903c134480babd63444d..d50c8eedf962fe942589e0e30993672e0dd10ada 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -70,20 +70,29 @@ fi
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
+  CROSS_CC="${ANDROID_TOOLCHAIN}/*-gcc" \
+  CROSS_CXX="${ANDROID_TOOLCHAIN}/*-g++" \
+  CROSS_LINK="${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}"
 }
 
-firstword() {
-  echo "${1}"
+android_goma_gyp() {
+  CROSS_CC="$GOMA_DIR/gomacc ${ANDROID_TOOLCHAIN}/*-gcc" \

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

This is the wrong way to do this.
goma/not-goma should not be a gyp-time decision.
If you simply set all these variables to the basename of the tool
(compiler/linker/etc) then you can determine goma/not-goma at ninja/make-time by
having $PATH either have gomadir first or $ANDROID_TOOLCHAIN first.

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

I think there are a few issues in play in here, let me try to explain... ;)

1. The original problem I'm trying to solve is to remove an evil "make()" /
"old_make()" function..

2. We're also trying to remove environment dependency on $CC* environment
variables at build time, and have gyp generate the make files self-contained.

3. finally, on the gyp generate make.py GenerateOutput (I'm not entirely sure
why), there's:

  for key, value in make_global_settings_dict:
    if value[0] != '$':
      value = '$(abspath %s)' % value


which requires us to pass the abspath (otherwise we'd end up with invalid
paths), and hence to generate  makefiles for either goma or non-goma...

I'm not sure how to best solve all of these, any ideas?

[Ami GONE FROM CHROMIUM, 2012/03/14 17:57:54]

I believe this is the core of your problem.  Why are you using
make_global_settings in the first place?

[bulach, 2012/03/14 18:28:31]

torne can explain in more details.. going forward with the android unification
and other build systems, we want makefiles to be self-contained and not depend
on setup scripts / environment variables...
the only way we could do that is by using this make_global_settings, but if
there's any other suggestion, I'd be happy to follow! :)

+  CROSS_CXX="$GOMA_DIR/gomacc ${ANDROID_TOOLCHAIN}/*-g++" \
+  CROSS_LINK="$GOMA_DIR/gomacc ${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}"
 }
 
-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)
 
 # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
 # to canonicalize them (remove double '/', remove trailing '/', etc).