Fix the 32-bit executable building errors on lollipop

Now the lollipop bionic has full kernel uapi headers.
Just convert the old macros to match the new headers.
No additional hacking is needed.

diff --git a/Android.mk b/Android.mk
index eff5898..bd7acb1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -10,13 +10,14 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-KERNEL_DIR ?= kernel
-
-use_uapi = $(firstword $(wildcard $(addprefix $(KERNEL_DIR)/include/,uapi/$(1) $(1))))
-
-LOCAL_CFLAGS += \
-       -include $(call use_uapi,video/uvesafb.h) \
-       -include $(call use_uapi,linux/connector.h)
+LOCAL_CFLAGS := \
+       -Wno-unused-parameter
+
+LOCAL_CFLAGS_x86 := \
+       -DIF_MASK=X86_EFLAGS_IF \
+       -DIOPL_MASK=X86_EFLAGS_IOPL \
+       -DTF_MASK=X86_EFLAGS_TF \
+       -DVIF_MASK=X86_EFLAGS_VIF
 
 LOCAL_SRC_FILES := \
        v86.c \

diff --git a/v86.h b/v86.h
index 6af4ba0..b096975 100644 (file)
--- a/v86.h
+++ b/v86.h
@@ -18,10 +18,8 @@
 
 struct completion;
 
-#ifndef __ANDROID__
 #include <linux/connector.h>
 #include <video/uvesafb.h>
-#endif
 
 //#define ulog(args...)        do {} while (0)
 //#define ulog(args...)                fprintf(stdout, ##args)

diff --git a/x86emu/x86emu/x86emui.h b/x86emu/x86emu/x86emui.h
index e6c311f..9427d6f 100644 (file)
--- a/x86emu/x86emu/x86emui.h
+++ b/x86emu/x86emu/x86emui.h
@@ -57,7 +57,7 @@
 #ifdef __cplusplus
 #define        X86EMU_UNUSED(v)
 #else
-#define        X86EMU_UNUSED(v)        v
+#define        X86EMU_UNUSED(v)        __attribute__((unused)) v
 #endif
 
 #include "x86emu.h"