envsetup: Remove host_arch bitness check, let android_gyp print that it's going away.

Since it's no longer necessary to source envsetup, having a bitness check in
here isn't very useful.

Let build/gyp_chromium always pass --check for android so that it behaves the
same as android_gyp and let android_gyp print a note that it'll disappear
eventually.

BUG=330631
NOTRY=true

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

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

android/envsetup.sh

@@ -14,21 +14,6 @@ fi
 
 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
-    ;;
-  *)
-    echo "ERROR: Unsupported host architecture (${host_arch})."
-    echo "Try running this script on a Linux/x86_64 machine instead."
-    return 1
-esac
-
 CURRENT_DIR="$(readlink -f "${SCRIPT_DIR}/../../")"
 if [[ -z "${CHROME_SRC}" ]]; then
   # If $CHROME_SRC was not set, assume current directory is CHROME_SRC.
@@ -72,9 +57,7 @@ if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
   export CHROME_BUILD_TYPE="_official"
 fi
 
-# 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.
+  echo "Please call build/gyp_chromium instead. android_gyp is going away."
   "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
 }

gyp_chromium

@@ -283,6 +283,8 @@ if __name__ == '__main__':
           gyp_vars_dict.get('OS') in ['android', 'ios'],
           'GYP_CROSSCOMPILE' not in os.environ)):
     os.environ['GYP_CROSSCOMPILE'] = '1'
+  if gyp_vars_dict.get('OS') == 'android':
+    args.append('--check')
 
   args.extend(
       ['-I' + i for i in additional_include_files(supplemental_includes, args)])