From 42d95a0afb26560586232961445ba36de387ca37 Mon Sep 17 00:00:00 2001
From: djsollen <djsollen@google.com>
Date: Thu, 17 Mar 2016 10:45:47 -0700
Subject: 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
---
 platform_tools/android/bin/android_gdbserver | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'platform_tools/android/bin/android_gdbserver')

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[@]}"
-- 
cgit v1.2.3