Commit: 34c22c5ba951e4df7cc72d8d10da78064d5cfbe4 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: 34c22c5ba951e4df7cc72d8d10da78064d5cfbe4 (tree)
• Zeit: 2009-05-19 00:37:02
• Autor: David 'Digit' Turner <digit@goog...>
• Commiter: The Android Open Source Project

Log Message

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.

Ändern Zusammenfassung

• modified: adb/Android.mk
• modified: adb/framebuffer_service.c
• modified: adb/sysdeps.h
• modified: libcutils/Android.mk
• delete: {include/cutils => adb}/fdevent.h
• delete: {libcutils => adb}/fdevent.c

Diff

--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -57,6 +57,8 @@ LOCAL_SRC_FILES := \
 
 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 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	adb.c \
+	fdevent.c \
 	transport.c \
 	transport_local.c \
 	transport_usb.c \

--- 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)
 

--- 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>

--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -169,7 +169,7 @@ extern int socket_network_client(const char *host, int port, int type);
 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 @@ static __inline__  int  adb_is_absolute_host_path( const char*  path )
 
 #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>

--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -61,7 +61,6 @@ else
     commonSources += \
         mspace.c \
         selector.c \
-        fdevent.c \
         tztime.c \
         adb_networking.c \
         zygote.c