Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f04ee373 authored by David Turner's avatar David Turner Committed by android code review
Browse files

Merge "Update gdbclient for x86 target"

parents 2db32730 7d0ede73

envsetup.sh

+7 −2
Original line number Diff line number Diff line
@@ -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