commit 8c346f6adad904138a1116d03cf43f8ebbac9f4d
author Pirama Arumuga Nainar <pirama@google.com> Mon Jan 05 14:33:33 2015 -0800
committer Pirama Arumuga Nainar <pirama@google.com> Mon Jan 05 14:36:38 2015 -0800
tree b878c8adbf10c17c7c738ae305c7671a5096a0db
parent ae90c07c9786622acf9ee329282161ed9aea011e

Fix incorrect name for x86 platform's gdb

gdbclient looks for 'x86_64-linux-androideabi-gdb' whereas the prebuilts
have gdb as 'x86_64-linux-android-gdb'

$ cd $ANDROID_BUILD_TOP
$ find prebuilts -iname *x86*gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb

Change-Id: Ib940ecd6f345ea501da79834168b91cc0f6e5a96

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 9a540ef..b6b62ea 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1078,9 +1078,9 @@
   elif [[ $CPU_ABI =~ (^|,)arm ]]; then
     GDB=arm-linux-androideabi-gdb
   elif [[ $CPU_ABI =~ (^|,)x86_64 ]]; then
-    GDB=x86_64-linux-androideabi-gdb
+    GDB=x86_64-linux-android-gdb
   elif [[ $CPU_ABI =~ (^|,)x86 ]]; then
-    GDB=x86_64-linux-androideabi-gdb
+    GDB=x86_64-linux-android-gdb
   elif [[ $CPU_ABI =~ (^|,)mips64 ]]; then
     GDB=mipsel-linux-android-gdb
     GDB64=mips64el-linux-android-gdb