default to device type of last build if no device type is given

platform_tools/android/bin/android_setup.sh

Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index fc3b6699f9d888007ddc77afd697af1100b366a4..b0f36f0617c65bf2ddcba6d1704ee05feea16ac8 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -26,6 +26,19 @@ while (( "$#" )); do
   shift
 done
 
+if [ -z "$DEVICE_ID" ]

[borenet, 2013/08/19 20:30:50]

Why not do this block where the previous default was set?  That way, if "-d" is
supplied, it can take precedence over either default.

+then
+
+    if [ ! -f .android_config ]
+    then
+        DEVICE_ID="arm_v7"
+        echo "INFO: no target device type was specified so using the default 'arm_v7'"

[borenet, 2013/08/19 20:30:50]

Use "${DEVICE_ID}" instead of "arm_v7"?

+    else
+        DEVICE_ID=$(cat .android_config)
+        echo "INFO: no target device type was specified so using the device from the most recent build"

[borenet, 2013/08/19 20:30:50]

Include $DEVICE_ID?

+    fi
+fi
+
 function exportVar {
   NAME=$1
   VALUE=$2
@@ -160,11 +173,6 @@ setup_device() {
   # Setup the build variation depending on the target device
   TARGET_DEVICE="$1"
 
-  if [ -z "$TARGET_DEVICE" ]; then
-    echo "INFO: no target device type was specified so using the default 'arm_v7'"
-    TARGET_DEVICE="arm_v7"
-  fi
-
   case $TARGET_DEVICE in
     nexus_s)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"