Refix of adb gdb su usage

build/android/adb_gdb

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 # A generic script used to attach to a running Chromium process and
 # debug it. Most users should not use this directly, but one of the
 # wrapper scripts like adb_gdb_content_shell
@@ skipping 826 matching lines @@
 # Determine if 'adb shell' runs as root or not.
 # If so, we can launch gdbserver directly, otherwise, we have to
 # use run-as $PACKAGE_NAME ..., which requires the package to be debuggable.
 #
 if [ "$SU_PREFIX" ]; then
   # Need to check that this works properly.
   SU_PREFIX_TEST_LOG=$TMPDIR/su-prefix.log
   adb_shell $SU_PREFIX \"echo "foo"\" > $SU_PREFIX_TEST_LOG 2>&1
   if [ $? != 0 -o "$(cat $SU_PREFIX_TEST_LOG)" != "foo" ]; then
     echo "ERROR: Cannot use '$SU_PREFIX' as a valid su prefix:"
-    echo "$ adb shell $SU_PREFIX echo foo"
+    echo "$ adb shell $SU_PREFIX \"echo foo\""
     cat $SU_PREFIX_TEST_LOG
     exit 1
   fi
-  COMMAND_PREFIX="$SU_PREFIX"
+  COMMAND_PREFIX="$SU_PREFIX \""
+  COMMAND_SUFFIX="\""
 else
   SHELL_UID=$(adb shell cat /proc/self/status | \
               awk '$1 == "Uid:" { print $2; }')
   log "Shell UID: $SHELL_UID"
   if [ "$SHELL_UID" != 0 -o -n "$NO_ROOT" ]; then
     COMMAND_PREFIX="run-as $PACKAGE_NAME"
+    COMMAND_SUFFIX=
   else
     COMMAND_PREFIX=
+    COMMAND_SUFFIX=
   fi
 fi
 log "Command prefix: '$COMMAND_PREFIX'"
+log "Command suffix: '$COMMAND_SUFFIX'"
 
 # Pull device's system libraries that are mapped by our process.
 # Pulling all system libraries is too long, so determine which ones
 # we need by looking at /proc/$PID/maps instead
 if [ "$PULL_LIBS" -a -z "$NO_PULL_LIBS" ]; then
   echo "Extracting system libraries into: $PULL_LIBS_DIR"
   rm -f $PULL_LIBS_DIR/build.prop
   MAPPINGS=$(adb_shell $COMMAND_PREFIX \"cat /proc/$PID/maps\")
+  MAPPINGS=$(adb_shell $COMMAND_PREFIX cat /proc/$PID/maps $COMMAND_SUFFIX)

[jbudorick, 2015/01/27 14:24:43]

Shouldn't this replace the line above?

[ripp, 2015/01/28 07:01:32]

Really should. My fault, don't know how it happened, sorry.

Fixed.

   if [ $? != 0 ]; then
     echo "ERROR: Could not list process's memory mappings."
     if [ "$SU_PREFIX" ]; then
       panic "Are you sure your --su-prefix is correct?"
     else
       panic "Use --su-prefix if the application is not debuggable."
     fi
   fi
   SYSTEM_LIBS=$(echo "$MAPPINGS" | \
       awk '$6 ~ /\/system\/.*\.so$/ { print $6; }' | sort -u)
@@ skipping 56 matching lines @@
 
 # Start gdbserver in the background
 # Note that using run-as requires the package to be debuggable.
 #
 # If not, this will fail horribly. The alternative is to run the
 # program as root, which requires of course root privileges.
 # Maybe we should add a --root option to enable this?
 #
 log "Starting gdbserver in the background:"
 GDBSERVER_LOG=$TMPDIR/gdbserver-$TMP_ID.log
-log "adb shell $COMMAND_PREFIX \"$TARGET_GDBSERVER :$TARGET_PORT \
---attach $PID"\"
-("$ADB" shell $COMMAND_PREFIX \"$TARGET_GDBSERVER :$TARGET_PORT \
- --attach $PID\" > $GDBSERVER_LOG 2>&1) &
+log "adb shell $COMMAND_PREFIX $TARGET_GDBSERVER :$TARGET_PORT \
+--attach $PID $COMMAND_SUFFIX"
+("$ADB" shell $COMMAND_PREFIX $TARGET_GDBSERVER :$TARGET_PORT \
+ --attach $PID $COMMAND_SUFFIX > $GDBSERVER_LOG 2>&1) &
 GDBSERVER_PID=$!
 echo "$GDBSERVER_PID" > $GDBSERVER_PIDFILE
 log "background job pid: $GDBSERVER_PID"
 
 # Check that it is still running after a few seconds. If not, this means we
 # could not properly attach to it
 sleep 2
 log "Job control: $(jobs -l)"
 STATE=$(jobs -l | awk '$2 == "'$GDBSERVER_PID'" { print $3; }')
 if [ "$STATE" != "Running" ]; then
@@ skipping 42 matching lines @@
 
 if [ "$VERBOSE" -gt 0 ]; then
   echo "### START $COMMANDS"
   cat $COMMANDS
   echo "### END $COMMANDS"
 fi
 
 log "Launching gdb client: $GDB $GDB_ARGS -x $COMMANDS"
 $GDB $GDB_ARGS -x $COMMANDS &&
 rm -f "$GDBSERVER_PIDFILE"