Fix gyp on Android called by gclient or makefile regen

build/android/envsetup.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sets up environment for building Chromium on Android. Only Android NDK,
 # Revision 6b on Linux or Mac is offically supported.
 #
 # To run this script, the system environment ANDROID_NDK_ROOT must be set
@@ skipping 97 matching lines @@
 
 if [ ! -d "${CHROME_SRC}" ]; then
   echo "CHROME_SRC must be set to the path of Chrome source code." >& 2
   return 1
 fi
 
 # Add Chromium Android development scripts to system path.
 # Must be after CHROME_SRC is set.
 export PATH=$PATH:${CHROME_SRC}/build/android
 
+ANDROID_GOMA_WRAPPER=""
+if [[ -d $GOMA_DIR ]]; then
+  ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc"
+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)
+
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
-  ANDROID_GOMA_WRAPPER=""
-  if [[ -d $GOMA_DIR ]]; then
-    ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc"
-  fi
-  # Ninja requires "*_target" for target builds.
-  ANDROID_GOMA_WRAPPER=${ANDROID_GOMA_WRAPPER} \
-  CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \
-  CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++) \
-  LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \
-  AR_target=$(basename ${ANDROID_TOOLCHAIN}/*-ar) \
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" "$@"
 }
 
 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).
 DEFINES+=" OS=android"
 DEFINES+=" android_build_type=0"  # Currently, Only '0' is supportted.
@@ skipping 14 matching lines @@
 export GYP_DEFINES="${DEFINES}"
 
 # Use the "android" flavor of the Makefile generator for both Linux and OS X.
 export GYP_GENERATORS="make-android"
 
 # Use our All target as the default
 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
 
 # We want to use our version of "all" targets.
 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"