From 61f17259c4323dcd18c4fd27a0d174b432e5172a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 8 Mar 2019 16:25:32 -0800 Subject: Move GDB out of HostTools. Test: ./checkbuild.py gdb Test: ./checkbuild.py --system windows gdb Test: ./checkbuild.py --system windows64 gdb Test: cd samples/NdkGdbSample && \ ./gradlew installDebug && \ $NDK/ndk-gdb --launch Bug: http://b/62547070 Change-Id: I4e2472de84f1ca475f9235dc983fb61e261701a9 --- sources/host-tools/gdb-stub/gdb-stub.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'sources') diff --git a/sources/host-tools/gdb-stub/gdb-stub.c b/sources/host-tools/gdb-stub/gdb-stub.c index edb76cb33..49c6fc321 100644 --- a/sources/host-tools/gdb-stub/gdb-stub.c +++ b/sources/host-tools/gdb-stub/gdb-stub.c @@ -43,21 +43,12 @@ #define dbg_printf(...) do {} while(0) #endif -// When built for the Android NDK, values are -// passed in on the GCC commandline, and when -// built for mingw-builds, these defaults are -// used. -#ifndef GDB_TO_PYTHON_REL_DIR - #define GDB_TO_PYTHON_REL_DIR "..\\opt\\bin" -#endif +#define GDB_TO_PYTHON_REL_DIR "." -#ifndef GDB_EXECUTABLE_ORIG_FILENAME - #define GDB_EXECUTABLE_ORIG_FILENAME "gdborig.exe" -#endif +#define GDB_EXECUTABLE_ORIG_FILENAME "gdb-orig.exe" -#ifndef PYTHONHOME_REL_DIR - #define PYTHONHOME_REL_DIR "..\\opt" -#endif +// The stub is installed to $PREBUILTS/bin, PYTHONHOME is $PREBUILTS. +#define PYTHONHOME_REL_DIR ".." #define DIE_IF_FALSE(var) \ do { \ -- cgit v1.2.3