android envsetup: Make passing --target-arch an error.

This is to make sure I found all the bots that used to pass this. I'll
completely remove the flag in a day or two.

Also remove the function for printing usage information. I accidentally removed
processing for --help in r252034, but having a --help flag for printing --help
as only supported flag is a bit silly anyways, so get rid of this.

(Depends on https://codereview.chromium.org/170783015/
and https://chrome-internal-review.googlesource.com/#/c/155292/)

BUG=330631
R=yfriedman@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252166 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 10 deletions

diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 087b560..e8a373c 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -22,7 +22,9 @@ SCRIPT_DIR="$(dirname "${BASH_SOURCE:-$0}")"
 
 export ANDROID_SDK_BUILD=1  # Default to SDK build.
 
-process_options "$@"
+if ! process_options "$@" ; then
+  return 1
+fi
 
 # When building WebView as part of Android we can't use the SDK. Other builds
 # default to using the SDK.
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 083cdef..5d47276 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -43,23 +43,16 @@ common_vars_defines() {
 
 
 ################################################################################
-# Prints out help message on usage.
-################################################################################
-print_usage() {
-  echo "usage: ${0##*/} [--help]" >& 2
-  echo "--help                  this help" >& 2
-}
-
-################################################################################
 # Process command line options.
 ################################################################################
 process_options() {
   while [[ -n $1 ]]; do
     case "$1" in
       --target-arch=*)
-        echo "WARNING: --target-arch is ignored and will be an error soon."
+        echo "ERROR: --target-arch is ignored."
         echo "Pass -Dtarget_arch=foo to gyp instead."
         echo "(x86 is spelled ia32 in gyp, mips becomes mipsel, arm stays arm)"
+        return 1
         ;;
       *)
         # Ignore other command line options