Upstream recent downstream changes in envsetup.sh.

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.  It can either be
 # compiled with the Android tree or using the Android SDK/NDK. To build with
 # NDK/SDK: ". build/android/envsetup.sh".  Environment variable
 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
 # specifiy build type.
 
+# Source functions script.  The file is in the same directory as this script.
+. "$(dirname $BASH_SOURCE)"/envsetup_functions.sh
+
+export ANDROID_SDK_BUILD=1  # Default to SDK build.
+
+process_options "$@"
+
 # When building WebView as part of Android we can't use the SDK. Other builds
 # default to using the SDK.
 if [[ "${CHROME_ANDROID_BUILD_WEBVIEW}" -eq 1 ]]; then
   export ANDROID_SDK_BUILD=0
-else
-  export ANDROID_SDK_BUILD=1
 fi
 
 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
   echo "Using SDK build"
 fi
 
 host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
 
 case "${host_os}" in
   "linux")
@@ skipping 19 matching lines @@
   # directory, "${CURRENT_DIR/"${CHROME_SRC}"/}" will be "".
   # Otherwise, it will equal to "${CURRENT_DIR}"
   echo "Warning: Current directory is out of CHROME_SRC, it may not be \
 the one you want."
   echo "${CHROME_SRC}"
 fi
 
 # Android sdk platform version to use
 export ANDROID_SDK_VERSION=16
 
-# Source functions script.  The file is in the same directory as this script.
-. "$(dirname $BASH_SOURCE)"/envsetup_functions.sh
-
 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
-  process_options "$@"
   if [[ -z "${TARGET_ARCH}" ]]; then
     return 1
   fi
   sdk_build_init
 # Sets up environment for building Chromium for Android with source. Expects
 # android environment setup and lunch.
 elif [[ -z "$ANDROID_BUILD_TOP" || \
         -z "$ANDROID_TOOLCHAIN" || \
         -z "$ANDROID_PRODUCT_OUT" ]]; then
   echo "Android build environment variables must be set."
@@ skipping 32 matching lines @@
   # This is just a simple wrapper of gyp_chromium, please don't add anything
   # in this function.
   echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
   (
     "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
   )
 }
 
 # FLOCK needs to be null on system that has no flock
 which flock > /dev/null || export FLOCK=