Fix android build for r292935 (personality.h)

It turns out things are not as simple as I hoped. sys/personality.h
exists on all androids but it does not define the required symbols on
all platform levels.

Add a compile check for platform level to compile against both new and
old android headers.

llvm-svn: 292939

1 files changed, 10 insertions, 5 deletions

diff --git a/lldb/source/Host/linux/ProcessLauncherLinux.cpp b/lldb/source/Host/linux/ProcessLauncherLinux.cpp
index ec54024963f..f8dcd9a1955 100644
--- a/lldb/source/Host/linux/ProcessLauncherLinux.cpp
+++ b/lldb/source/Host/linux/ProcessLauncherLinux.cpp
@@ -16,16 +16,21 @@
 #include "lldb/Target/ProcessLaunchInfo.h"
 
 #include <limits.h>
-#ifndef __ANDROID__
-#include <sys/personality.h>
-#else
-#include <linux/personality.h>
-#endif
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 
 #include <sstream>
 
+#ifdef __ANDROID__
+#include <android/api-level.h>
+#endif
+
+#if defined(__ANDROID_API__) && __ANDROID_API__ < 21
+#include <linux/personality.h>
+#else
+#include <sys/personality.h>
+#endif
+
 using namespace lldb;
 using namespace lldb_private;