android envsetup: Stop honoring --target-arch parameter.

Most people don't use this parameter and get arm binaries. This is
still the default, so this change shouldn't affect most people.

Folks should instead pass -Dtarget_arch to gyp. (Or, soon, envsetup will stop
clobbering GYP_DEFINES, then you can just add target_arch to your GYP_DEFINES.)
Note that in gyp land, 'mips' is called 'mipsel' and 'x86' is called 'ia32'.
'arm' stays 'arm'.

So for example, instead of running

  . build/android/envsetup.sh --target-arch=mips
  android_gyp

you'd run

  . build/android/envsetup.sh
  android_gyp -Dtarget_arch=mipsel

I updated the bots I was able to find to pass the -D flag in addition to
--target-arch. After this CL here is in, I'll update the bots to stop passing
--target-arch, and then I'll make --target-arch a hard error in this script for
a while, to make sure nobody still uses it.

BUG=330631,34476
R=torne@chromium.org
TBR=yfriedman

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

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

1 files changed, 4 insertions, 28 deletions

diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index eef1350..083cdef 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -39,24 +39,6 @@ common_vars_defines() {
   if [[ -d $GOMA_DIR ]]; then
     DEFINES+=" use_goma=1 gomadir=$GOMA_DIR"
   fi
-
-  # The following defines will affect ARM code generation of both C/C++ compiler
-  # and V8 mksnapshot.
-  case "${TARGET_ARCH}" in
-    "arm")
-      DEFINES+=" target_arch=arm"
-      ;;
-    "x86")
-      DEFINES+=" target_arch=ia32"
-      ;;
-    "mips")
-      DEFINES+=" target_arch=mipsel"
-      ;;
-    *)
-      echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
-      print_usage
-      return 1
-  esac
 }
 
 
@@ -64,8 +46,7 @@ common_vars_defines() {
 # Prints out help message on usage.
 ################################################################################
 print_usage() {
-  echo "usage: ${0##*/} [--target-arch=value] [--help]" >& 2
-  echo "--target-arch=value     target CPU architecture (arm=default, x86)" >& 2
+  echo "usage: ${0##*/} [--help]" >& 2
   echo "--help                  this help" >& 2
 }
 
@@ -76,11 +57,9 @@ process_options() {
   while [[ -n $1 ]]; do
     case "$1" in
       --target-arch=*)
-        target_arch="$(echo "$1" | sed 's/^[^=]*=//')"
-        ;;
-      --help)
-        print_usage
-        return 1
+        echo "WARNING: --target-arch is ignored and will be an error soon."
+        echo "Pass -Dtarget_arch=foo to gyp instead."
+        echo "(x86 is spelled ia32 in gyp, mips becomes mipsel, arm stays arm)"
         ;;
       *)
         # Ignore other command line options
@@ -89,9 +68,6 @@ process_options() {
     esac
     shift
   done
-
-  # Sets TARGET_ARCH. Defaults to arm if not specified.
-  TARGET_ARCH=${target_arch:-arm}
 }
 
 ################################################################################