platform_tools/android/bin/android_gdb_app - Issue 1900773002: Update android toolchain variable to point to root dir and not the bin

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_app

Issue 1900773002: Update android toolchain variable to point to root dir and not the bin (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 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:

View side-by-side diff with in-line comments

Download patch

Index: platform_tools/android/bin/android_gdb_app

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

index f0879fa10ff42b433206b4de160bd3882d5e222a..74da0da6cb64670b10bd1d898579f5c12bb3e705 100755

--- a/platform_tools/android/bin/android_gdb_app

+++ b/platform_tools/android/bin/android_gdb_app

@@ -35,7 +35,7 @@ adb_pull_if_needed /data/data/com.skia.sample_app/lib/libskia_android.so $GDB_TM

adb_pull_if_needed /data/data/com.skia.sample_app/lib/libSampleApp.so $GDB_TMP_DIR

echo "Pushing gdbserver..."

-adb_push_if_needed $ANDROID_TOOLCHAIN/../gdbserver /data/local/tmp

+adb_push_if_needed $ANDROID_TOOLCHAIN/gdbserver /data/local/tmp

# Launch the app

echo "Launching the app..."

@@ -61,7 +61,7 @@ echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP

# Launch gdb client

echo "Entering gdb client shell"

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

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

"$GDB_COMMAND" -x $GDBSETUP

# Clean up:

« no previous file with comments | « no previous file | platform_tools/android/bin/android_gdb_native » ('j') | no next file with comments »