From 390d7c08821750d0633435278b2d533fd6b1a7a5 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Fri, 13 Jan 2012 14:04:38 -0800
Subject: fix personality call.

Change-Id: I25845344494ac15b4a6876784d2b040779892459
---
 vm/Android.mk                      | 5 -----
 vm/native/dalvik_system_Zygote.cpp | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/vm/Android.mk b/vm/Android.mk
index c23c160a0..17b5a0415 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -69,9 +69,6 @@ ifeq ($(WITH_JIT),true)
     # Enable assertions and JIT self-verification
     LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 -DLOG_NDEBUG=1 -DWITH_DALVIK_ASSERT \
                     -DWITH_SELF_VERIFICATION $(target_smp_flag)
-
-    LOCAL_C_INCLUDES += bionic/libc/kernel/common
-
     LOCAL_MODULE := libdvm_sv
     include $(BUILD_SHARED_LIBRARY)
 
@@ -126,8 +123,6 @@ ifeq ($(WITH_HOST_DALVIK),true)
             $(patsubst libffi, ,$(LOCAL_SHARED_LIBRARIES))
     endif
 
-    LOCAL_C_INCLUDES += bionic/libc/kernel/common
-
     LOCAL_CFLAGS += $(host_smp_flag)
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := libdvm
diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index 2d66cef6a..492ea4a6a 100644
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@ -21,12 +21,12 @@
 #include "native/InternalNativePriv.h"
 
 #include <signal.h>
-#include <linux/personality.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <grp.h>
 #include <errno.h>
 #include <paths.h>
+#include <sys/personality.h>
 
 #if defined(HAVE_PRCTL)
 # include <sys/prctl.h>
-- 
cgit v1.2.3