platform_tools/android/bin/android_gdb_exe - Issue 256413006: Fix android_gdbserver script to work with changes from a137675.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/bin/android_gdb_exe

Issue 256413006: Fix android_gdbserver script to work with changes from a137675. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: AnotherPatchSet Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: platform_tools/android/bin/android_gdb_exe

diff --git a/platform_tools/android/bin/android_gdb_exe b/platform_tools/android/bin/android_gdb_exe

index 6a95e2610194983f868348eb343debd4e918590a..920a16b38a124abf09da16ac28c332470950b167 100755

--- a/platform_tools/android/bin/android_gdb_exe

+++ b/platform_tools/android/bin/android_gdb_exe

@@ -6,6 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

source $SCRIPT_DIR/android_setup.sh

# setup the gdbserver

+export BUILDTYPE # from android_setup.sh

djsollen 2014/04/25 17:42:54 what did this line do exactly?

hal.canary 2014/04/25 18:38:20 So android_gdbserver sees this variable as set by

$SCRIPT_DIR/android_gdbserver -d ${DEVICE_ID} ${APP_ARGS[@]}

# quit if gdbserver setup failed

@@ -36,12 +37,8 @@ echo "sharedLibrary $APP_NAME" >> $GDBSETUP

# Launch gdb client

echo "Entering gdb client shell"

-if [ "$ANDROID_ARCH" == "x86" ]

-then

- $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP

-else

- $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP

-fi

+GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1)

+"$GDB_COMMAND" -x $GDBSETUP

# Clean up

rm -rf $GDB_TMP_DIR