various bug fixes.

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Parse the arguments for a DEVICE_ID.
 DEVICE_ID=""
 DEVICE_SERIAL=""
 while (( "$#" )); do
   if [[ $(echo "$1" | grep "^-d$") != "" ]];
   then
@@ skipping 147 matching lines @@
   DEFINES="${DEFINES} skia_shared_lib=1"
 
   # Setup the build variation depending on the target device
   TARGET_DEVICE="$1"
 
   if [ -z "$TARGET_DEVICE" ]; then
     if [ -f .android_config ]; then
       TARGET_DEVICE=$(cat .android_config)
       echo "INFO: no target device was specified so using the device (${TARGET_DEVICE}) from the most recent build"
     else
-      TARGET_DEVICE="arm_v7"  
+      TARGET_DEVICE="arm_v7_thumb"  
       echo "INFO: no target device type was specified so using the default '${TARGET_DEVICE}'"
     fi
   fi
 
   case $TARGET_DEVICE in
     nexus_s)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
       ANDROID_ARCH="arm"
       ;;
@@ skipping 78 matching lines @@
   then
     HOST_DST="${HOST_DST}/$(basename ${ANDROID_SRC})"
   fi
 
   echo "HOST: $HOST_DST"
 
   if [ -f $HOST_DST ];
   then
     #get the MD5 for dst and src
     ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_SRC`
-    HOST_MD5=`md5sum $HOST_DST`
+    if [ $(uname) == "Darwin" ]; then
+      HOST_MD5=`md5 -q $HOST_DST`
+    else
+      HOST_MD5=`md5sum $HOST_DST`
+    fi
 
     if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ];
     then
       $ADB $DEVICE_SERIAL pull $ANDROID_SRC $HOST_DST
 #   else
 #      echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]"
     fi
   else
     $ADB $DEVICE_SERIAL pull $ANDROID_SRC $HOST_DST
   fi
@@ skipping 15 matching lines @@
     ANDROID_DST="${ANDROID_DST}/$(basename ${HOST_SRC})"
   fi
 
   echo "ANDROID: $ANDROID_DST"
 
   ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld $ANDROID_DST`
   if [ "${ANDROID_LS:0:1}" == "-" ];
   then
     #get the MD5 for dst and src
     ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_DST`
-    HOST_MD5=`md5sum $HOST_SRC`
+    if [ $(uname) == "Darwin" ]; then
+      HOST_MD5=`md5 -q $HOST_SRC`
+    else
+      HOST_MD5=`md5sum $HOST_SRC`
+    fi
 
     if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ];
     then
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
 #    else
 #      echo "md5 match of android [${ANDROID_DST}] and host [${HOST_SRC}]"
     fi
   else
     $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
   fi
 }
 
 # Set up the device.
 setup_device "${DEVICE_ID}"
 if [[ "$?" != "0" ]]; then
   exit 1
 fi