Second attempt at fixing Ninja build for Android and change make for host os optionally use goma

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 82370ccee63ebefc9910e42cf277d31ad6fcef87..766d1bc355474ff93c5ab7e13e9811817668e6cf 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -95,10 +95,28 @@ if [[ -d $GOMA_DIR ]]; then
 fi
 export ANDROID_GOMA_WRAPPER
 
-export CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc)
-export CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++)
-export LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc)
-export AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar)
+# Set cross-compile targets for Ninja. The configuration is necessarily
+# different from Make because we bake absolute paths into the generated
+# makefiles whereas Ninja builds depend on the PATH variable being set in order
+# to pick up the correct version of the build tools.
+if [[ "${GYP_GENERATORS}" == "ninja" ]]; then
+  echo "Configuring environment for Ninja."
+  export CC=$(basename ${ANDROID_TOOLCHAIN}/*-gcc)
+  export CXX=$(basename ${ANDROID_TOOLCHAIN}/*-g++)
+  export AR=$(basename ${ANDROID_TOOLCHAIN}/*-ar)
+  export CC_host=gcc
+  export CXX_host=g++

[Nico, 2012/08/13 22:34:31]

This makes it hard to build with clang I suppose?

Also, wouldn't removing the GENERATOR!=ninja in build/common.gypi effectively do
this same thing?

As for the basename / absolute path issue, isn't that independent of make vs
ninja and instead dependent on goma vs not goma?

[Yaron, 2012/08/13 23:12:06]

True, this makes it so that ninja+clang doesn't work and yes it's more of a
goma/non-goma issue but not entirely.

You're right that removing the ninja guard in build/common.gypi works. However,
it's a bit peculiar because it then is actually relying on the fact that
CXX_target is being set and it's not actually using the fact that CC is being
set in gyp. Also, it makes the local build not-gomaified. I think it's easier to
follow if I just include this:

$ head out/Release/build.ninja 
cc = arm-linux-androideabi-gcc
cxx = arm-linux-androideabi-g++
ld = flock linker.lock $cxx
ar = arm-linux-androideabi-ar
ar_host = ar
cc_host = /usr/bin/gcc
cxx_host = /usr/bin/g++

+  export AR_host=ar
+fi
+
+# Add a paranoid check to help developers accidentally switching between Ninja
+# and non-Ninja which would lead to a build break.
+if [[ "${GYP_GENERATORS}" == "ninja" && \
+  "$CC" == $(basename ${ANDROID_TOOLCHAIN}/*-gcc)  ]]; then
+  echo "Warning! You are using a non-ninja gyp generator but"
+  echo "overriding the CC environment variable. Build may"
+  echo "not be correct."
+fi
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {