diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-05-18 08:37:02 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-18 08:37:02 -0700 |
| commit | 34c22c5ba951e4df7cc72d8d10da78064d5cfbe4 (patch) | |
| tree | 1567cec8459bdad82cc1faf72d81122d059d3ad8 | |
| parent | 8537cc56bb10b8c62dc82cf7e494566c0d942c49 (diff) | |
| parent | 414ff7d98ac8d7610a26206335954ad15f43f3ac (diff) | |
| download | core-34c22c5ba951e4df7cc72d8d10da78064d5cfbe4.tar.gz core-34c22c5ba951e4df7cc72d8d10da78064d5cfbe4.tar.bz2 core-34c22c5ba951e4df7cc72d8d10da78064d5cfbe4.zip | |
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.
| -rw-r--r-- | adb/Android.mk | 3 | ||||
| -rw-r--r-- | adb/fdevent.c (renamed from libcutils/fdevent.c) | 2 | ||||
| -rw-r--r-- | adb/fdevent.h (renamed from include/cutils/fdevent.h) | 0 | ||||
| -rw-r--r-- | adb/framebuffer_service.c | 2 | ||||
| -rw-r--r-- | adb/sysdeps.h | 4 | ||||
| -rw-r--r-- | libcutils/Android.mk | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index c8606cfd9..6cbaf82b8 100644 --- 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 \ diff --git a/libcutils/fdevent.c b/adb/fdevent.c index 4cf46faf7..5d6fb96cb 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 index 7a442d46c..7a442d46c 100644 --- a/include/cutils/fdevent.h +++ b/adb/fdevent.h diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c index 0de0dd5e6..65cb20a10 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 e5d17a85b..3c74e0fbe 100644 --- 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> diff --git a/libcutils/Android.mk b/libcutils/Android.mk index b6d806e46..c9b0ebe28 100644 --- 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 |