Add small user-event abstraction interface.

Preparation for future UI frontend/backend separation.

This is done to ensure that the code under android/skin/ does not depend
on any QEMU-specific header. We achieve this by adding a new abstract header
"user-events.h" and one QEMU-specific implementations for the functions
defined here.

This also modifies console.h and vl-android.c to make them closer to
upstream (by removing Android-specific changes).

+ fix Makefile.android to always build SDL from sources in standalone mode.

Change-Id: I0d152741e7bb2c9cd283f5c35bd054385c7c1eb3

1 files changed, 2 insertions, 1 deletions

diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c
index d8e265c..9050aa6 100644
--- a/hw/goldfish_events_device.c
+++ b/hw/goldfish_events_device.c
@@ -14,6 +14,7 @@
 #include "android/charmap.h"
 #include "android/globals.h"  /* for android_hw */
 #include "irq.h"
+#include "user-events.h"
 
 #define MAX_EVENTS 256*4
 
@@ -385,7 +386,7 @@ void events_dev_init(uint32_t base, qemu_irq irq)
 
     qemu_add_kbd_event_handler(events_put_keycode, s);
     qemu_add_mouse_event_handler(events_put_mouse, s, 1, "goldfish-events");
-    qemu_add_generic_event_handler(events_put_generic, s);
+    user_event_register_generic(s, events_put_generic);
 
     s->base = base;
     s->irq = irq;