From baf9102b110702b18826f5aec67429af4283def8 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 8 Oct 2014 09:56:45 +0100
Subject: [PATCH] Really fix --gdb when running tests on target.

Change-Id: Ic96edb066d345839a4af371e7c10327713a045c7
---
 test/etc/run-test-jar | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 59d241aba..9a32ec7a3 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -16,10 +16,11 @@ DALVIKVM="dalvikvm32"
 DEBUGGER="n"
 DEV_MODE="n"
 DEX2OAT=""
-GDB_SERVER="gdbserver"
 FALSE_BIN="/system/bin/false"
 FLAGS=""
 GDB=""
+GDB_ARGS=""
+GDB_SERVER="gdbserver"
 HAVE_IMAGE="y"
 HOST="n"
 INTERPRETER="n"
@@ -190,7 +191,6 @@ fi
 if [ "$USE_GDB" = "y" ]; then
   if [ "$HOST" = "n" ]; then
     GDB="$GDB_SERVER :5039"
-    GDB_ARGS="$DALVIKVM"
   else
     if [ `uname` = "Darwin" ]; then
         GDB=lldb
-- 
2.11.0