commit 30b96ba70d50d4c0ce6b990eefbb27cb150ee338
author Dmitriy Ivanov <dimitry@google.com> Mon Jun 29 21:08:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 29 21:08:28 2015 +0000
tree ff54c4002ba459c79cee4ce1370dabe3d85ed80e
parent 6201465c3c7ff383fe08ed033ea71d467b21b8b0
parent 91dcbe968b11858de90dc1d1a4878c68c57d0344

Merge "Use ro.hardware property to detect the device"

scripts/gdbclient

diff --git a/scripts/gdbclient b/scripts/gdbclient
index 2a84638..c170590 100755
--- a/scripts/gdbclient
+++ b/scripts/gdbclient
@@ -12,14 +12,6 @@
 # as well.
 source $ANDROID_BUILD_TOP/build/envsetup.sh
 
-function adb_get_product_device() {
-  local candidate=`adb shell getprop ro.product.device | tr -d '\r\n'`
-  if [ -z $candidate ]; then
-    candidate=`adb shell getprop ro.hardware | tr -d '\r\n'`
-  fi
-  echo $candidate
-}
-
 # returns 0 when process is not traced
 function adb_get_traced_by() {
   echo `adb shell cat /proc/$1/status | grep -e "^TracerPid:" | sed "s/^TracerPid:\t//" | tr -d '\r\n'`
@@ -45,7 +37,7 @@
     echo "Usage: gdbclient <pid|processname> [port number]"
     return -1
   fi
-  local DEVICE=$(adb_get_product_device)
+  local DEVICE=`adb shell getprop ro.hardware | tr -d '\r\n'`
 
   if [ -z "$DEVICE" ]; then
     echo "Error: Unable to get device name. Please check if device is connected and ANDROID_SERIAL is set."