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

platform_tools/android/bin/android_make

 #!/bin/bash
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# remove the existing .android_config file prior to running android_setup. If
+# we did not remove this here then we would build for whatever device type was
+# listed in the .android_config instead of the default device type.

[borenet, 2013/08/19 21:04:22]

This behavior is still a little strange to me - in my opinion, the logical
fallback chain is: device provided with "-d", previously-used device in
.android_config, arm_v7.  I don't use this workflow often though, so if arm_v7
is the common case I'm all for using that.

+if [ -f .android_config ]
+then
+  rm .android_config
+fi
+
+# run the config to setup the environment
 source $SCRIPT_DIR/android_setup.sh
 
+# write the device id into the .android_config file
+echo $DEVICE_ID > .android_config
+
 for arg in ${APP_ARGS[@]}
 do
   if [[ "${arg}" == "--use-ccache" ]];
   then
     if [[ -z "$ANDROID_MAKE_CCACHE" ]];
     then
       ANDROID_MAKE_CCACHE=$(which ccache)
     fi
   else
     makeVars=("${makeVars[@]}" "${arg}")
   fi
 
 shift
 done
 
 if [[ -n "$ANDROID_MAKE_CCACHE" ]]; then
   $ANDROID_MAKE_CCACHE --version &> /dev/null
   if [[ "$?" != "0" ]]; then
     echo "Unable to find ccache!"
     exit 1
   fi
 fi
 
-# write the out directory into the .android_config file
-echo $SKIA_OUT > .android_config
-
 make ${makeVars[@]}
 if [ $? != 0 ]
 then
   exit 1;
 fi