Don't rely on the Android toolchain being exported in the PATH for the...

Don't rely on the Android toolchain being exported in the PATH for the {CC,CXX,LINK,AR}_target defines.

The make build has start using these environment variables since gyp revision
1470[1]. This works in the Chromium repository as the Android toolchain is being
exported in the PATH, which is something WebKit doesn't do, and we shouldn't
be relying on in general. Instead, use the paths to the toolchain and prefix
them with Android's goma wrapper, which yields the same effect.

[1] https://code.google.com/p/gyp/source/detail?r=1470

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10827419

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152340 0039d316-1c4b-4281-b951-d872f2087c98

build/android/envsetup.sh

@@ -95,10 +95,11 @@ 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)
+export CC_target="${ANDROID_GOMA_WRAPPER} $(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)"
+export CXX_target="${ANDROID_GOMA_WRAPPER} \
+  $(echo -n ${ANDROID_TOOLCHAIN}/*-g++)"
+export LINK_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)
+export AR_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-ar)
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {