Streamline Thumb config.

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 86 matching lines @@
       TARGET_DEVICE=$(cat .android_config)
       verbose "no target device (-d), using ${TARGET_DEVICE} from most recent build"
     else
       TARGET_DEVICE="arm_v7"
       verbose "no target device (-d), using ${TARGET_DEVICE}"
     fi
   fi
 
   case $TARGET_DEVICE in
     arm)
-      DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0"
+      DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0"
       ANDROID_ARCH="arm"
       ;;
     arm_v7 | nexus_4 | nexus_5 | nexus_6 | nexus_7 | nexus_10 | xoom)
-      DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=1"
+      DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7"
       ANDROID_ARCH="arm"
       ;;
     arm_v7_neon)
-      DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
+      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"
       ANDROID_ARCH="arm64"
       ;;
     x86)
       DEFINES="${DEFINES} skia_arch_type=x86"
       ANDROID_ARCH="x86"
       ;;
@@ skipping 117 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}"