diff options
| author | Dan Albert <danalbert@google.com> | 2019-03-08 16:25:32 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-08-20 14:59:27 -0700 |
| commit | 61f17259c4323dcd18c4fd27a0d174b432e5172a (patch) | |
| tree | 58b6f094baed59a20f1cf9b79c6fd3f3158ce479 /sources | |
| parent | fe5512b37fbef472db20f4ae237ec8f761d09cfb (diff) | |
| download | ndk-61f17259c4323dcd18c4fd27a0d174b432e5172a.tar.gz | |
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
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/host-tools/gdb-stub/gdb-stub.c | 17 |
1 files changed, 4 insertions, 13 deletions
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 { \ |