From b4b053da66ce809db0b627ba5aaada6d553b44b7 Mon Sep 17 00:00:00 2001
From: jimmym <jimmym@opera.com>
Date: Wed, 4 Feb 2015 08:03:00 -0800
Subject: [PATCH] Make it possible to debug Release builds on rooted phones

https://codereview.chromium.org/884993003 broke gdb debugging
on Release buils. This commit makes sure it works to debug
Debug and Release (only on rooted device) builds.

BUG=453379

Review URL: https://codereview.chromium.org/891743003

Cr-Original-Commit-Position: refs/heads/master@{#314567}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: bb4db81dcbbe045c9ed2a7d05662af06064a3884
---
 android/adb_gdb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/adb_gdb b/android/adb_gdb
index 97d37db3a..c71b81646 100755
--- a/android/adb_gdb
+++ b/android/adb_gdb
@@ -26,6 +26,7 @@ fi
 TMPDIR=
 GDBSERVER_PIDFILE=
 TARGET_GDBSERVER=
+COMMAND_PREFIX=
 
 clean_exit () {
   if [ "$TMPDIR" ]; then
@@ -36,7 +37,7 @@ clean_exit () {
     fi
     if [ "$TARGET_GDBSERVER" ]; then
       log "Removing target gdbserver binary: $TARGET_GDBSERVER."
-      "$ADB" shell run-as "$PACKAGE_NAME" rm "$TARGET_GDBSERVER" >/dev/null 2>&1
+      "$ADB" shell "$COMMAND_PREFIX" rm "$TARGET_GDBSERVER" >/dev/null 2>&1
     fi
     log "Cleaning up: $TMPDIR"
     rm -rf "$TMPDIR"
@@ -908,7 +909,7 @@ SOLIB_DIRS=$(find $PULL_LIBS_DIR -mindepth 1 -maxdepth 4 -type d | \
 # Push gdbserver to the device
 log "Pushing gdbserver $GDBSERVER to $TARGET_GDBSERVER"
 adb push $GDBSERVER $TMP_TARGET_GDBSERVER &>/dev/null
-adb shell run-as $PACKAGE_NAME cp $TMP_TARGET_GDBSERVER .
+adb shell $COMMAND_PREFIX cp $TMP_TARGET_GDBSERVER $TARGET_GDBSERVER
 adb shell rm $TMP_TARGET_GDBSERVER
 fail_panic "Could not copy gdbserver to the device!"