android envsetup: Stop setting GYP_DEFINES.

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 6286a1e1f921a7a4eff30fd21f9c23e5480f9026..aece8c6b19dfd926f09f1df4e9976c53f1d0246d 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -12,7 +12,6 @@ if [[ -n "$BASH_VERSION" && "${BASH_SOURCE:-$0}" == "$0" ]]; then
   exit 1
 fi
 
-# Source functions script.  The file is in the same directory as this script.
 SCRIPT_DIR="$(dirname "${BASH_SOURCE:-$0}")"
 
 # Get host architecture, and abort if it is 32-bit.
@@ -64,9 +63,6 @@ export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
 # Must be after CHROME_SRC is set.
 export PATH=$PATH:${CHROME_SRC}/build/android
 
-# The set of GYP_DEFINES to pass to gyp.
-DEFINES="OS=android"
-
 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
   # These defines are used by various chrome build scripts to tag the binary's
   # version string as 'official' in linux builds (e.g. in
@@ -76,14 +72,6 @@ if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
   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
-
-export GYP_DEFINES="${DEFINES}"
-
 # Source a bunch of helper functions
 . ${CHROME_SRC}/build/android/adb_device_functions.sh