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

Commit 0ab21d3e authored by Nick Kralevich's avatar Nick Kralevich
Browse files

make gdbclient work on x86 

Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
parent ba2c734f

core/dumpvar.mk

+7 −1
Original line number Diff line number Diff line
@@ -5,11 +5,17 @@ ifeq ($(CALLED_FROM_SETUP),true) 


ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)



# Add the toolchain bin dir if it actually exists

# Add the ARM toolchain bin dir if it actually exists

ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)

	# this should be copied to HOST_OUT_EXECUTABLES instead

	ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin

endif



# Add the x86 toolchain bin dir if it actually exists

ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin),)

	# this should be copied to HOST_OUT_EXECUTABLES instead

	ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin

endif

ANDROID_BUILD_PATHS := $(ABP)

ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

envsetup.sh

+9 −1
Original line number Diff line number Diff line
@@ -704,6 +704,14 @@ function gdbclient() 
   local OUT_SO_SYMBOLS=$(get_abs_build_var TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)

   local OUT_EXE_SYMBOLS=$(get_abs_build_var TARGET_OUT_EXECUTABLES_UNSTRIPPED)

   local PREBUILTS=$(get_abs_build_var ANDROID_PREBUILTS)

   local ARCH=$(get_build_var TARGET_ARCH)

   local GDB

   case "$ARCH" in

       x86) GDB=i686-android-linux-gdb;;

       arm) GDB=arm-linux-androideabi-gdb;;

       *) echo "Unknown arch $ARCH"; return 1;;

   esac



   if [ "$OUT_ROOT" -a "$PREBUILTS" ]; then

       local EXE="$1"

       if [ "$EXE" ] ; then
@@ -744,7 +752,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"

       $GDB -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"

  else

       echo "Unable to determine build system output dir."

   fi