am 414ff7d9: Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
Merge commit '414ff7d98ac8d7610a26206335954ad15f43f3ac'
* commit '414ff7d98ac8d7610a26206335954ad15f43f3ac':
Move fdevent from libcutils into adb directory. ADB is the only client of this API, and I intend to modify it extensively to clean its codebase soon.
diff --git a/adb/Android.mk b/adb/Android.mk
index c8606cf..6cbaf82 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -57,6 +57,8 @@
ifneq ($(USE_SYSDEPS_WIN32),)
LOCAL_SRC_FILES += sysdeps_win32.c
+else
+ LOCAL_SRC_FILES += fdevent.c
endif
LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter
@@ -98,6 +100,7 @@
LOCAL_SRC_FILES := \
adb.c \
+ fdevent.c \
transport.c \
transport_local.c \
transport_usb.c \
diff --git a/libcutils/fdevent.c b/adb/fdevent.c
similarity index 99%
rename from libcutils/fdevent.c
rename to adb/fdevent.c
index 4cf46fa..5d6fb96 100644
--- a/libcutils/fdevent.c
+++ b/adb/fdevent.c
@@ -26,7 +26,7 @@
#include <stdarg.h>
#include <stddef.h>
-#include <cutils/fdevent.h>
+#include "fdevent.h"
#define TRACE(x...) fprintf(stderr,x)
diff --git a/include/cutils/fdevent.h b/adb/fdevent.h
similarity index 100%
rename from include/cutils/fdevent.h
rename to adb/fdevent.h
diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index 0de0dd5..65cb20a 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <fcntl.h>
-#include <cutils/fdevent.h>
+#include "fdevent.h"
#include "adb.h"
#include <linux/fb.h>
diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index e5d17a8..3c74e0f 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -169,7 +169,7 @@
extern int socket_loopback_server(int port, int type);
extern int socket_inaddr_any_server(int port, int type);
-/* normally provided by <cutils/fdevent.h> */
+/* normally provided by "fdevent.h" */
#define FDE_READ 0x0001
#define FDE_WRITE 0x0002
@@ -252,7 +252,7 @@
#else /* !_WIN32 a.k.a. Unix */
-#include <cutils/fdevent.h>
+#include "fdevent.h"
#include <cutils/sockets.h>
#include <cutils/properties.h>
#include <cutils/misc.h>
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index b6d806e..c9b0ebe 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -61,7 +61,6 @@
commonSources += \
mspace.c \
selector.c \
- fdevent.c \
tztime.c \
adb_networking.c \
zygote.c