Skip to content

Commit abb9d6f

Browse files
committed
Move iolooper to android/utils/
Since this is a base utility source file that doesn't depend or expose QEMU-specific stuff. It's also low-level and depends on android/base/ Change-Id: Ifd95e5c834205a473c7f383acd86af1f62c2678b
1 parent cf1e896 commit abb9d6f

11 files changed

+13
-13
lines changed

Makefile.common

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ common_LOCAL_SRC_FILES += \
138138
android/async-console.c \
139139
android/async-utils.c \
140140
android/framebuffer.c \
141-
android/iolooper.cpp \
142141
android/avd/hw-config.c \
143142
android/avd/info.c \
144143
android/avd/scanner.c \
@@ -196,6 +195,7 @@ common_LOCAL_SRC_FILES += \
196195
android/utils/format.cpp \
197196
android/utils/host_bitness.cpp \
198197
android/utils/http_utils.cpp \
198+
android/utils/iolooper.cpp \
199199
android/utils/ini.c \
200200
android/utils/intmap.c \
201201
android/utils/lineinput.c \

aio-android.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "block/block.h"
1616
#include "qemu/queue.h"
1717
#include "qemu/sockets.h"
18-
#include "android/iolooper.h"
18+
#include "android/utils/iolooper.h"
1919

2020
typedef struct AioHandler AioHandler;
2121

android/adb-server.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "qemu-common.h"
1818
#include "android/sockets.h"
19-
#include "android/iolooper.h"
19+
#include "android/utils/iolooper.h"
2020
#include "android/async-utils.h"
2121
#include "android/utils/debug.h"
2222
#include "android/utils/format.h"

android/async-socket-connector.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "android/utils/debug.h"
2424
#include "android/async-socket-connector.h"
2525
#include "utils/panic.h"
26-
#include "android/iolooper.h"
26+
#include "android/utils/iolooper.h"
2727

2828
#define E(...) derror(__VA_ARGS__)
2929
#define W(...) dwarning(__VA_ARGS__)

android/async-socket.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "android/utils/debug.h"
2626
#include "android/utils/eintr_wrapper.h"
2727
#include "android/utils/panic.h"
28-
#include "android/iolooper.h"
28+
#include "android/utils/iolooper.h"
2929

3030
#define E(...) derror(__VA_ARGS__)
3131
#define W(...) dwarning(__VA_ARGS__)

android/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
#include "android/framebuffer.h"
6767
#include "android/opengl/emugl_config.h"
68-
#include "android/iolooper.h"
68+
#include "android/utils/iolooper.h"
6969

7070
#include "android/skin/winsys.h"
7171

android/sdk-controller-socket.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "android/async-socket.h"
2626
#include "android/sdk-controller-socket.h"
2727
#include "utils/panic.h"
28-
#include "android/iolooper.h"
28+
#include "android/utils/iolooper.h"
2929

3030
#define E(...) derror(__VA_ARGS__)
3131
#define W(...) dwarning(__VA_ARGS__)

android/sync-utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "qemu-common.h"
2323
#include "errno.h"
24-
#include "android/iolooper.h"
24+
#include "android/utils/iolooper.h"
2525
#include "android/sockets.h"
2626
#include "android/utils/debug.h"
2727
#include "android/sync-utils.h"

android/iolooper.cpp renamed to android/utils/iolooper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "android/iolooper.h"
1+
#include "android/utils/iolooper.h"
22

33
#include "android/base/sockets/SocketWaiter.h"
44

include/android/iolooper.h renamed to android/utils/iolooper.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef IOLOOPER_H
2-
#define IOLOOPER_H
1+
#ifndef ANDROID_UTILS_IOLOOPER_H
2+
#define ANDROID_UTILS_IOLOOPER_H
33

44
#include "android/utils/compiler.h"
55

@@ -71,4 +71,4 @@ int iolooper_wait_absolute(IoLooper* iol, int64_t deadline);
7171

7272
ANDROID_END_HEADER
7373

74-
#endif /* IOLOOPER_H */
74+
#endif /* ANDROID_UTILS_IOLOOPER_H */

proxy/proxy_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <errno.h>
1818
#include "android/utils/misc.h"
1919
#include "android/utils/system.h"
20-
#include "android/iolooper.h"
20+
#include "android/utils/iolooper.h"
2121
#include <stdlib.h>
2222

2323
int proxy_log = 0;

0 commit comments

Comments
 (0)