diff options
Diffstat (limited to 'lldb/source/Plugins')
5 files changed, 16 insertions, 6 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp index 0263c23ce30..1e2a0c721ff 100644 --- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp +++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp @@ -9,7 +9,7 @@ #include "ObjectContainerBSDArchive.h" -#ifdef _WIN32 +#if defined(_WIN32) || defined(__ANDROID_NDK__) // Defines from ar, missing on Windows #define ARMAG "!<arch>\n" #define SARMAG 8 diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp index 7dc0a205146..1519c5b3789 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -820,7 +820,7 @@ PlatformLinux::LaunchNativeProcess ( lldb_private::NativeProcessProtocol::NativeDelegate &native_delegate, NativeProcessProtocolSP &process_sp) { -#if !defined(__linux__) +#if !defined(__linux__) || defined(__ANDROID_NDK__) return Error("only implemented on Linux hosts"); #else if (!IsHost ()) @@ -857,7 +857,7 @@ PlatformLinux::AttachNativeProcess (lldb::pid_t pid, lldb_private::NativeProcessProtocol::NativeDelegate &native_delegate, NativeProcessProtocolSP &process_sp) { -#if !defined(__linux__) +#if !defined(__linux__) || defined(__ANDROID_NDK__) return Error("only implemented on Linux hosts"); #else if (!IsHost ()) diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 2810b701c5c..abda9baecdb 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -18,7 +18,13 @@ #include <stdint.h> #include <unistd.h> #include <linux/unistd.h> +#if defined(__ANDROID_NDK__) && defined (__arm__) +#include <linux/personality.h> +#include <linux/user.h> +#else #include <sys/personality.h> +#include <sys/user.h> +#endif #ifndef __ANDROID__ #include <sys/procfs.h> #endif @@ -27,7 +33,6 @@ #include <sys/socket.h> #include <sys/syscall.h> #include <sys/types.h> -#include <sys/user.h> #include <sys/wait.h> #if defined (__arm64__) || defined (__aarch64__) diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp index 5bc8c51d74c..3efeb5de627 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp @@ -16,7 +16,13 @@ #include <stdint.h> #include <unistd.h> #include <elf.h> +#if defined(__ANDROID_NDK__) && defined (__arm__) +#include <linux/personality.h> +#include <linux/user.h> +#else #include <sys/personality.h> +#include <sys/user.h> +#endif #ifndef __ANDROID__ #include <sys/procfs.h> #endif @@ -25,7 +31,6 @@ #include <sys/socket.h> #include <sys/syscall.h> #include <sys/types.h> -#include <sys/user.h> #include <sys/wait.h> // C++ Includes diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp index 5579b0b64fc..a2ab67438b7 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp @@ -150,7 +150,7 @@ RegisterContextMacOSXFrameBackchain::ReadRegister (const RegisterInfo *reg_info, // TOOD: need a better way to detect when "long double" types are // the same bytes size as "double" #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) && !defined(_MSC_VER) && \ - !defined(__mips__) && !defined(__powerpc__) + !defined(__mips__) && !defined(__powerpc__) && !defined(__ANDROID_NDK__) case sizeof (long double): if (sizeof (long double) == sizeof(uint32_t)) { |
