diff options
Diffstat (limited to 'lldb/source/Plugins/Process/Linux')
-rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 7 | ||||
-rw-r--r-- | lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp | 7 |
2 files changed, 12 insertions, 2 deletions
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 |