Merge "Update gdbclient for x86 target"
This commit is contained in:
commit
f04ee37312
1 changed files with 7 additions and 2 deletions
|
@ -115,7 +115,12 @@ function setpaths()
|
|||
|
||||
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
|
||||
export ANDROID_EABI_TOOLCHAIN=
|
||||
toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
|
||||
case $(get_build_var TARGET_ARCH) in
|
||||
x86) toolchaindir=toolchain/i686-android-linux-4.4.3/bin
|
||||
;;
|
||||
arm|*) toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin
|
||||
;;
|
||||
esac
|
||||
if [ -d "$prebuiltdir/$toolchaindir" ]; then
|
||||
export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir
|
||||
fi
|
||||
|
@ -744,7 +749,7 @@ function gdbclient()
|
|||
echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
|
||||
echo >>"$OUT_ROOT/gdbclient.cmds" ""
|
||||
|
||||
arm-linux-androideabi-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
|
||||
$ANDROID_EABI_TOOLCHAIN/*-gdb -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
|
||||
else
|
||||
echo "Unable to determine build system output dir."
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue