diff options
| author |  djsollen <djsollen@google.com> | 2016-03-17 10:45:47 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-17 10:45:47 -0700 |
| commit | 42d95a0afb26560586232961445ba36de387ca37 (patch) | |
| tree | 4a035661259aec4c744b4ae39884a8f89d470ac6 /platform_tools/android/bin/android_gdbserver | |
| parent | 5a6098217c87080ddb04db18aab82a38ab142aef (diff) | |
Fix gdb debugging for the latest NDK release.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1806343003
Review URL: https://codereview.chromium.org/1806343003
Diffstat (limited to 'platform_tools/android/bin/android_gdbserver')
| -rwxr-xr-x | platform_tools/android/bin/android_gdbserver | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver index a7b20bff97..d9d1d7eefd 100755 --- a/platform_tools/android/bin/android_gdbserver +++ b/platform_tools/android/bin/android_gdbserver @@ -34,15 +34,11 @@ for library_file in \ libm.so \ liblog.so \ libz.so \ - libgccdemangle.so \ libsigchain.so \ libcutils.so \ libunwind.so \ - libunwind-ptrace.so \ libbacktrace.so \ libutils.so \ - libstlport.so \ - libGLES_trace.so \ libEGL.so \ libGLESv2.so \ ; do @@ -76,8 +72,10 @@ $ADB forward "tcp:5039" "tcp:5039" # Kill all previous instances of gdbserver and the app to rid all port overriding errors. echo "Killing any running Skia processes." -$ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill -$ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill +set +e +$ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill 2> /dev/null +$ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill 2> /dev/null +set -e # Starting up gdbserver in android shell echo "Starting gdbserver with command: ${APP_ARGS[@]}" |