Remove skia_arch_width, fold into skia_arch_type.

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
@@ skipping 101 matching lines @@
       ;;
     arm_v7 | xoom)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7"
       ANDROID_ARCH="arm"
       ;;
     arm_v7_neon | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7"
       ANDROID_ARCH="arm"
       ;;
     arm64 | nexus_9)
-      DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
+      DEFINES="${DEFINES} skia_arch_type=arm64"
       ANDROID_ARCH="arm64"
       ;;
     x86)
       DEFINES="${DEFINES} skia_arch_type=x86"
       ANDROID_ARCH="x86"
       ;;
     x86_64 | x64)
       DEFINES="${DEFINES} skia_arch_type=x86_64"
       ANDROID_ARCH="x86_64"
       ;;
     mips)
-      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
+      DEFINES="${DEFINES} skia_arch_type=mips32"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="mips"
       ;;
     mips_dsp2)
-      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
+      DEFINES="${DEFINES} skia_arch_type=mips32"
       DEFINES="${DEFINES} mips_arch_variant=mips32r2 mips_dsp=2"
       ANDROID_ARCH="mips"
       ;;
     mips64)
-      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=64"
+      DEFINES="${DEFINES} skia_arch_type=mips64"
       ANDROID_ARCH="mips64"
       ;;
     *)
       if [ -z "$ANDROID_IGNORE_UNKNOWN_DEVICE" ]; then
           echo "ERROR: unknown device $TARGET_DEVICE"
           exit 1
       fi
       # If ANDROID_IGNORE_UNKNOWN_DEVICE is set, then ANDROID_TOOLCHAIN
       # or ANDROID_ARCH should be set; Otherwise, ANDROID_ARCH
       # defaults to 'arm' and the default ARM toolchain is used.
@@ skipping 102 matching lines @@
       adb_push_if_needed $HOST_SRC $ANDROID_DST
     else
       echo -n "$ANDROID_DST "
       $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
     fi
   fi
 }
 
 setup_device "${DEVICE_ID}"