Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: platform_tools/android/bin/android_gdb_apk

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:
View unified diff | Download patch
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # android_gdb: Pushes parameter binary and gdbserver. Connects 3 # android_gdb: Pushes parameter binary and gdbserver. Connects
4 # and enters debugging environment. 4 # and enters debugging environment.
5 5
6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
7 source $SCRIPT_DIR/android_setup.sh 7 source $SCRIPT_DIR/android_setup.sh
8 8
9 APP_NAME=${APP_ARGS[0]} 9 APP_NAME=${APP_ARGS[0]}
10 PORT=5039 10 PORT=5039
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 # Set up gdb commands 46 # Set up gdb commands
47 GDBSETUP=$GDB_TMP_DIR/gdb.setup 47 GDBSETUP=$GDB_TMP_DIR/gdb.setup
48 echo "file $GDB_TMP_DIR/app_process" >> $GDBSETUP 48 echo "file $GDB_TMP_DIR/app_process" >> $GDBSETUP
49 echo "target remote :$PORT" >> $GDBSETUP 49 echo "target remote :$PORT" >> $GDBSETUP
50 echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP 50 echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP
51 echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP 51 echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP
52 52
53 # Launch gdb client 53 # Launch gdb client
54 echo "Entering gdb client shell" 54 echo "Entering gdb client shell"
55 if [ "$ANDROID_ARCH" == "x86" ] 55 GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1)
56 then 56 "$GDB_COMMAND" -x $GDBSETUP
57 $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP
58 else
59 $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP
60 fi
61 57
62 # Clean up 58 # Clean up
63 rm -rf $GDB_TMP_DIR 59 rm -rf $GDB_TMP_DIR
64 60
OLDNEW
« no previous file with comments | « no previous file | platform_tools/android/bin/android_gdb_exe » ('j') | platform_tools/android/bin/android_gdb_exe » ('J')

Powered by Google App Engine
This is Rietveld 408576698