diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-24 18:36:36 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-24 18:36:36 +0000 |
| commit | 44566e2a157915974cfc08819e8f9182690092a1 (patch) | |
| tree | 1091f93e3a66efe4a91d0cb659f85318eb647332 /platform_tools/android/bin/android_gdb_exe | |
| parent | b45bd1f7fd60dbaa38340359f14e96b6a475d12d (diff) | |
Fix android_gdbserver script to work with changes from a137675.
Also stop assuming ANDROID_ARCH one of x86 or arm.
NOTRY=true
R=mtklein@google.com, djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/256413006
git-svn-id: http://skia.googlecode.com/svn/trunk@14358 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/bin/android_gdb_exe')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_exe | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/platform_tools/android/bin/android_gdb_exe b/platform_tools/android/bin/android_gdb_exe index 6a95e26101..920a16b38a 100755 --- a/platform_tools/android/bin/android_gdb_exe +++ b/platform_tools/android/bin/android_gdb_exe @@ -6,6 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $SCRIPT_DIR/android_setup.sh # setup the gdbserver +export BUILDTYPE # from android_setup.sh $SCRIPT_DIR/android_gdbserver -d ${DEVICE_ID} ${APP_ARGS[@]} # quit if gdbserver setup failed @@ -36,12 +37,8 @@ echo "sharedLibrary $APP_NAME" >> $GDBSETUP # Launch gdb client echo "Entering gdb client shell" -if [ "$ANDROID_ARCH" == "x86" ] -then - $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP -else - $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP -fi +GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1) +"$GDB_COMMAND" -x $GDBSETUP # Clean up rm -rf $GDB_TMP_DIR |