Fix GOMA_DIR on android.

The DEFINES was too late, by this time DEFINES already got exported
as GYP_DEFINES

BUG=none
TEST=set GOMA_DIR=$HOME/goma, . build/android/envsetup.sh, android_gyp,
check that out/Release/build.ninja contains goma line
TBR=ilevy@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/143523006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@246062 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/envsetup.sh

@@ -119,12 +119,6 @@ fi
 # Source a bunch of helper functions
 . ${CHROME_SRC}/build/android/adb_device_functions.sh
 
-# TODO(thakis), Jan 18 2014: Remove this after two weeks or so, after telling
-# everyone to set use_goma in GYP_DEFINES instead of a GOMA_DIR env var.
-if [[ -d $GOMA_DIR ]]; then
-  DEFINES+=" use_goma=1 gomadir=$GOMA_DIR"
-fi
-
 # Declare Android are cross compile.
 export GYP_CROSSCOMPILE=1
 

android/envsetup_functions.sh

@@ -96,6 +96,12 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
     export CHROME_BUILD_TYPE="_official"
   fi
 
+  # TODO(thakis), Jan 18 2014: Remove this after two weeks or so, after telling
+  # everyone to set use_goma in GYP_DEFINES instead of a GOMA_DIR env var.
+  if [[ -d $GOMA_DIR ]]; then
+    DEFINES+=" use_goma=1 gomadir=$GOMA_DIR"
+  fi
+
   # The order file specifies the order of symbols in the .text section of the
   # shared library, libchromeview.so.  The file is an order list of section
   # names and the library is linked with option