Update from https://crrev.com/314320

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 18 matching lines @@
 
 clean_exit () {
   if [ "$TMPDIR" ]; then
     GDBSERVER_PID=$(cat $GDBSERVER_PIDFILE 2>/dev/null)
     if [ "$GDBSERVER_PID" ]; then
       log "Killing background gdbserver process: $GDBSERVER_PID"
       kill -9 $GDBSERVER_PID >/dev/null 2>&1
     fi
     if [ "$TARGET_GDBSERVER" ]; then
       log "Removing target gdbserver binary: $TARGET_GDBSERVER."
-      "$ADB" shell rm "$TARGET_GDBSERVER" >/dev/null 2>&1
+      "$ADB" shell run-as "$PACKAGE_NAME" rm "$TARGET_GDBSERVER" >/dev/null 2>&1
     fi
     log "Cleaning up: $TMPDIR"
     rm -rf "$TMPDIR"
   fi
   trap "" EXIT
   exit $1
 }
 
 # Ensure clean exit on Ctrl-C or normal exit.
 trap "clean_exit 1" INT HUP QUIT TERM
@@ skipping 677 matching lines @@
 
   SYMBOL_DIR=$CHROMIUM_SRC/$CHROMIUM_OUT_DIR/$SUBDIR
   log "Auto-config: --symbol-dir=$SYMBOL_DIR"
 }
 
 if [ -z "$SYMBOL_DIR" ]; then
   detect_symbol_dir "$BUILDTYPE"
 fi
 
 # Allow several concurrent debugging sessions
-TARGET_GDBSERVER=/data/local/tmp/gdbserver-adb-gdb-$TMP_ID
+TARGET_GDBSERVER=/data/data/$PACKAGE_NAME/gdbserver-adb-gdb-$TMP_ID
+TMP_TARGET_GDBSERVER=/data/local/tmp/gdbserver-adb-gdb-$TMP_ID
 
 # Return the build fingerprint contained in a build.prop file.
 # $1: path to build.prop file
 get_build_fingerprint_from () {
   cat "$1" | grep -e '^ro.build.fingerprint=' | cut -d= -f2
 }
 
 
 ORG_PULL_LIBS_DIR=$PULL_LIBS_DIR
 PULL_LIBS_DIR=${PULL_LIBS_DIR:-$DEFAULT_PULL_LIBS_DIR}
@@ skipping 89 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)
   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 14 matching lines @@
 SOLIB_DIRS=$(find $PULL_LIBS_DIR -mindepth 1 -maxdepth 4 -type d | \
              grep -v "^$" | tr '\n' ':')
 
 # This is a re-implementation of gdbclient, where we use compatible
 # versions of gdbserver and $GDBNAME to ensure that everything works
 # properly.
 #
 
 # Push gdbserver to the device
 log "Pushing gdbserver $GDBSERVER to $TARGET_GDBSERVER"
-adb push $GDBSERVER $TARGET_GDBSERVER &>/dev/null
+adb push $GDBSERVER $TMP_TARGET_GDBSERVER &>/dev/null
+adb shell run-as $PACKAGE_NAME cp $TMP_TARGET_GDBSERVER .
+adb shell rm $TMP_TARGET_GDBSERVER
 fail_panic "Could not copy gdbserver to the device!"
 
 PORT=5039
 HOST_PORT=$PORT
 TARGET_PORT=$PORT
 
 # Select correct app_process for architecture.
 case $TARGET_ARCH in
       arm|x86|mips) GDBEXEC=app_process;;
       arm64|x86_64) GDBEXEC=app_process64;;
@@ skipping 21 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"