Move iolooper.h to include/android/
+ Move iolooper-select.c to android/
Change-Id: I5154aa491132b43c3b80c248bb8dd968f4d41c2a
diff --git a/Makefile.common b/Makefile.common
index c112693..f8a9669 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -98,11 +98,11 @@
# Android utility functions
#
common_LOCAL_SRC_FILES += \
- iolooper-select.c \
android/async-console.c \
android/async-utils.c \
android/charmap.c \
android/framebuffer.c \
+ android/iolooper-select.c \
android/keycode-array.c \
android/avd/hw-config.c \
android/avd/info.c \
diff --git a/aio-android.c b/aio-android.c
index be0e769..e2e55cf 100644
--- a/aio-android.c
+++ b/aio-android.c
@@ -15,7 +15,7 @@
#include "block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
typedef struct AioHandler AioHandler;
diff --git a/android/adb-server.c b/android/adb-server.c
index bc7baa1..117b7a8 100644
--- a/android/adb-server.c
+++ b/android/adb-server.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "android/sockets.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#include "android/async-utils.h"
#include "android/utils/debug.h"
#include "android/utils/list.h"
diff --git a/android/async-socket-connector.c b/android/async-socket-connector.c
index f4d51b5..71740e4 100644
--- a/android/async-socket-connector.c
+++ b/android/async-socket-connector.c
@@ -23,7 +23,7 @@
#include "android/utils/debug.h"
#include "android/async-socket-connector.h"
#include "utils/panic.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#define E(...) derror(__VA_ARGS__)
#define W(...) dwarning(__VA_ARGS__)
diff --git a/android/async-socket.c b/android/async-socket.c
index ab4e4b6..92c2ef7 100644
--- a/android/async-socket.c
+++ b/android/async-socket.c
@@ -24,7 +24,7 @@
#include "android/async-socket-connector.h"
#include "android/async-socket.h"
#include "utils/panic.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#define E(...) derror(__VA_ARGS__)
#define W(...) dwarning(__VA_ARGS__)
diff --git a/iolooper-select.c b/android/iolooper-select.c
similarity index 98%
rename from iolooper-select.c
rename to android/iolooper-select.c
index 7055781..91dfece 100644
--- a/iolooper-select.c
+++ b/android/iolooper-select.c
@@ -1,4 +1,4 @@
-#include "iolooper.h"
+#include "android/iolooper.h"
#include "qemu-common.h"
/* An implementation of iolooper.h based on Unix select() */
diff --git a/android/looper-generic.c b/android/looper-generic.c
index 9fd4f0b..c8df86d 100644
--- a/android/looper-generic.c
+++ b/android/looper-generic.c
@@ -15,7 +15,7 @@
#include "android/utils/refset.h"
#include "android/utils/system.h"
#include "android/looper.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#include "android/sockets.h"
#include <inttypes.h>
#include <limits.h>
diff --git a/android/main.c b/android/main.c
index 757a05f..61f794a 100644
--- a/android/main.c
+++ b/android/main.c
@@ -55,7 +55,7 @@
#include "android/snapshot.h"
#include "android/framebuffer.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
AndroidRotation android_framebuffer_rotation;
diff --git a/android/protocol/core-connection.c b/android/protocol/core-connection.c
index 35f4d6a..68831d4 100644
--- a/android/protocol/core-connection.c
+++ b/android/protocol/core-connection.c
@@ -15,7 +15,7 @@
#include "android/sockets.h"
#include "qemu-common.h"
#include "errno.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#include "android/android.h"
#include "android/utils/debug.h"
#include "android/globals.h"
diff --git a/android/sdk-controller-socket.c b/android/sdk-controller-socket.c
index 8b0d813..eb1f220 100644
--- a/android/sdk-controller-socket.c
+++ b/android/sdk-controller-socket.c
@@ -25,7 +25,7 @@
#include "android/async-socket.h"
#include "android/sdk-controller-socket.h"
#include "utils/panic.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#define E(...) derror(__VA_ARGS__)
#define W(...) dwarning(__VA_ARGS__)
diff --git a/android/sync-utils.c b/android/sync-utils.c
index cab0fa6..4f2fd81 100644
--- a/android/sync-utils.c
+++ b/android/sync-utils.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "errno.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#include "android/sockets.h"
#include "android/utils/debug.h"
#include "android/sync-utils.h"
diff --git a/iolooper.h b/include/android/iolooper.h
similarity index 100%
rename from iolooper.h
rename to include/android/iolooper.h
diff --git a/proxy/proxy_common.c b/proxy/proxy_common.c
index 74e2929..543433b 100644
--- a/proxy/proxy_common.c
+++ b/proxy/proxy_common.c
@@ -17,7 +17,7 @@
#include <errno.h>
#include "android/utils/misc.h"
#include "android/utils/system.h"
-#include "iolooper.h"
+#include "android/iolooper.h"
#include <stdlib.h>
int proxy_log = 0;