Fix adb_pull_if_needed

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Fail-fast if anything in the script fails.
 set -e
 
 BUILDTYPE=${BUILDTYPE-Debug}
 
 while (( "$#" )); do
@@ skipping 175 matching lines @@
 # adb_pull_if_needed(android_src, host_dst)
 adb_pull_if_needed() {
 
   # get adb location
   source $SCRIPT_DIR/utils/setup_adb.sh
 
   # read input params
   ANDROID_SRC="$1"
   HOST_DST="$2"
 
-  if [ -d $HOST_DST ];
-  then
-    HOST_DST="${HOST_DST}/$(basename ${ANDROID_SRC})"
-  fi
-
-
   if [ -f $HOST_DST ];
   then
     #get the MD5 for dst and src
     ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_SRC`
     if [ $(uname) == "Darwin" ]; then
       HOST_MD5=`md5 -q $HOST_DST`
     else
       HOST_MD5=`md5sum $HOST_DST`
     fi
 
@@ skipping 50 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}"