Fix gdb debugging for the latest NDK release.

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 ###############################################################################
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 ###############################################################################
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
@@ skipping 201 matching lines @@
 # adb_push_if_needed(host_src, android_dst)
 adb_push_if_needed() {
 
   # get adb location
   source $SCRIPT_DIR/utils/setup_adb.sh
 
   # read input params
   local HOST_SRC="$1"
   local ANDROID_DST="$2"
 
+  # disable crashing on failed commands since newer (N+) versions of Android
+  # return an error when attempting to run ls on a directory or file that does
+  # not exist.
+  set +e
+
   ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld $ANDROID_DST`
   HOST_LS=`ls -ld $HOST_SRC`
   if [ "${ANDROID_LS:0:1}" == "d" -a "${HOST_LS:0:1}" == "-" ];
   then
     ANDROID_DST="${ANDROID_DST}/$(basename ${HOST_SRC})"
   fi
 
-
-  ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld $ANDROID_DST`
+  ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld $ANDROID_DST 2> /dev/null`
   if [ "${ANDROID_LS:0:1}" == "-" ]; then
     #get the MD5 for dst and src depending on OS and/or OS revision
-    ANDROID_MD5_SUPPORT=`$ADB $DEVICE_SERIAL shell ls -ld /system/bin/md5`
-    if [ "${ANDROID_MD5_SUPPORT:0:15}" != "/system/bin/md5" ]; then
+    ANDROID_MD5_SUPPORT=`$ADB $DEVICE_SERIAL shell ls -ld /system/bin/md5 2> /dev/null`
+    if [ "${ANDROID_MD5_SUPPORT:0:1}" == "-" ]; then
       ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_DST`
     else
       ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5sum $ANDROID_DST`
     fi
 
     if [ $(uname) == "Darwin" ]; then
       HOST_MD5=`md5 -q $HOST_SRC`
     else
       HOST_MD5=`md5sum $HOST_SRC`
     fi
@@ skipping 10 matching lines @@
     HOST_LS=`ls -ld $HOST_SRC`
     if [ "${HOST_LS:0:1}" == "d" ]; then
       $ADB $DEVICE_SERIAL shell mkdir -p $ANDROID_DST
       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
+
+  # turn error checking back on
+  set -e
 }
 
 setup_device "${DEVICE_ID}"