diff options
| author |  djsollen <djsollen@google.com> | 2016-05-02 09:19:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-02 09:19:59 -0700 |
| commit | 3a6aa4cedaf20c5010956aff221b14356ecdce17 (patch) | |
| tree | 9a8d806bb39b7b376835deacbd99514b9adf478a /platform_tools | |
| parent | a13efa690622d753303970ed8bddf1d8b84da0dc (diff) | |
Update gdb_app script to work with NDK r11c
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1936163002
Review-Url: https://codereview.chromium.org/1936163002
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_app | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/platform_tools/android/bin/android_gdb_app b/platform_tools/android/bin/android_gdb_app index 74da0da6cb..046fee3dea 100755 --- a/platform_tools/android/bin/android_gdb_app +++ b/platform_tools/android/bin/android_gdb_app @@ -28,11 +28,6 @@ fi # We need the debug symbols from these files GDB_TMP_DIR=$SKIA_OUT/android_gdb_tmp mkdir -p $GDB_TMP_DIR -echo "Copying symbol files" -adb_pull_if_needed /system/bin/app_process $GDB_TMP_DIR -adb_pull_if_needed /system/lib/libc.so $GDB_TMP_DIR -adb_pull_if_needed /data/data/com.skia.sample_app/lib/libskia_android.so $GDB_TMP_DIR -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 @@ -54,15 +49,12 @@ sleep 2 # Set up gdb commands GDBSETUP=$GDB_TMP_DIR/gdb.setup -echo "file $GDB_TMP_DIR/app_process" >> $GDBSETUP echo "target remote :$PORT" >> $GDBSETUP -echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP -echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP + # Launch gdb client echo "Entering gdb client shell" -GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/bin/*-gdb | head -n1) -"$GDB_COMMAND" -x $GDBSETUP +${ANDROID_TOOLCHAIN}/host_prebuilt/bin/gdb-orig -x $GDBSETUP # Clean up: # We could 'rm -rf $GDB_TMP_DIR', but doing so would cause subsequent debugging |