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

platform_tools/android/bin/android_make

Index: platform_tools/android/bin/android_make
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make
index ad52d67bca62c1aa10abd0ba5cb5b43330813588..4796c34337ddd6099fdd680f6d3cccaed0ce1356 100755
--- a/platform_tools/android/bin/android_make
+++ b/platform_tools/android/bin/android_make
@@ -1,8 +1,19 @@
 #!/bin/bash
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# remove the existing .android_config file prior to running the setup.
+if [ -f .android_config ]
+then
+  rm .android_config
+fi

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

I'm confused - why do we want to remove this?

[djsollen, 2013/08/19 20:55:04]

We need to remove it or android_setup will default to the device_id stored in
this file instead of the arm_v7 default.

+
+# run the config to setup the toolchain and target_device
 source $SCRIPT_DIR/android_setup.sh
 
+# write the out directory into the .android_config file
+echo $DEVICE_ID > .android_config
+
 for arg in ${APP_ARGS[@]}
 do
   if [[ "${arg}" == "--use-ccache" ]];
@@ -26,9 +37,6 @@ if [[ -n "$ANDROID_MAKE_CCACHE" ]]; then
   fi
 fi
 
-# write the out directory into the .android_config file
-echo $SKIA_OUT > .android_config
-
 make ${makeVars[@]}
 if [ $? != 0 ]
 then