android envsetup: Stop setting GYP_DEFINES.

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.
 
 # Make sure we're being sourced (possibly by another script). Check for bash
 # since zsh sets $0 when sourcing.
 if [[ -n "$BASH_VERSION" && "${BASH_SOURCE:-$0}" == "$0" ]]; then
   echo "ERROR: envsetup must be sourced."
   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.
 host_arch=$(uname -m)
 case "${host_arch}" in
   x86_64)  # pass
     ;;
   i?86)
     echo "ERROR: Android build requires a 64-bit host build machine."
     return 1
@@ skipping 31 matching lines @@
 fi
 
 # Add Android SDK tools to system path.
 export PATH=$PATH:${ANDROID_SDK_ROOT}/tools
 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
 
 # Add Chromium Android development scripts to system path.
 # 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
   # chrome/trunk/src/chrome/tools/build/version.py).
   export OFFICIAL_BUILD=1
   export CHROMIUM_BUILD="_google_chrome"
   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
 
 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
 android_gyp() {
   # This is just a simple wrapper of gyp_chromium, please don't add anything
   # in this function.
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
 }