diff --git a/envsetup.sh b/envsetup.sh
index 7bb56ae6bf..479157932a 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -995,6 +995,9 @@ function gdbclient()
        local EXE="$1"
        if [ "$EXE" ] ; then
            EXE=$1
+           if [[ $EXE =~ ^[^/].* ]] ; then
+               EXE="system/bin/"$EXE
+           fi
        else
            EXE="app_process"
        fi