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

build/android/envsetup_functions.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.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
@@ skipping 21 matching lines @@
     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
-
-  # 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
 }
 
 
 ################################################################################
 # 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
 }
 
 ################################################################################
 # Process command line options.
 ################################################################################
 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
         echo "Unknown option: $1"
         ;;
     esac
     shift
   done
-
-  # Sets TARGET_ARCH. Defaults to arm if not specified.
-  TARGET_ARCH=${target_arch:-arm}
 }
 
 ################################################################################
 # Initializes environment variables for NDK/SDK build.
 ################################################################################
 sdk_build_init() {
   # Allow the caller to override a few environment variables. If any of them is
   # unset, we default to a sane value that's known to work. This allows for
   # experimentation with a custom SDK.
   if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then
@@ skipping 49 matching lines @@
   DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
   DEFINES+=" android_sdk_version=sdk_version_unused_in_webview_build"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
     DEFINES+=" logging_like_official_build=1"
     DEFINES+=" tracing_like_official_build=1"
   fi
   export GYP_DEFINES="${DEFINES}"
 }