system/corennnnn
| 修订版 | 34c22c5ba951e4df7cc72d8d10da78064d5cfbe4 (tree) |
|---|---|
| 时间 | 2009-05-19 00:37:02 |
| 作者 | David 'Digit' Turner <digit@goog...> |
| Commiter | The Android Open Source Project |
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':
adb/Android.mk (diff)
adb/framebuffer_service.c (diff)
adb/sysdeps.h (diff) libcutils/Android.mk (diff) {include/cutils => adb}/fdevent.h {libcutils => adb}/fdevent.c| @@ -57,6 +57,8 @@ LOCAL_SRC_FILES := \ | ||
| 57 | 57 | |
| 58 | 58 | ifneq ($(USE_SYSDEPS_WIN32),) |
| 59 | 59 | LOCAL_SRC_FILES += sysdeps_win32.c |
| 60 | +else | |
| 61 | + LOCAL_SRC_FILES += fdevent.c | |
| 60 | 62 | endif |
| 61 | 63 | |
| 62 | 64 | LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter |
| @@ -98,6 +100,7 @@ include $(CLEAR_VARS) | ||
| 98 | 100 | |
| 99 | 101 | LOCAL_SRC_FILES := \ |
| 100 | 102 | adb.c \ |
| 103 | + fdevent.c \ | |
| 101 | 104 | transport.c \ |
| 102 | 105 | transport_local.c \ |
| 103 | 106 | transport_usb.c \ |
| @@ -26,7 +26,7 @@ | ||
| 26 | 26 | #include <stdarg.h> |
| 27 | 27 | #include <stddef.h> |
| 28 | 28 | |
| 29 | -#include <cutils/fdevent.h> | |
| 29 | +#include "fdevent.h" | |
| 30 | 30 | |
| 31 | 31 | #define TRACE(x...) fprintf(stderr,x) |
| 32 | 32 |
| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | #include <string.h> |
| 21 | 21 | #include <fcntl.h> |
| 22 | 22 | |
| 23 | -#include <cutils/fdevent.h> | |
| 23 | +#include "fdevent.h" | |
| 24 | 24 | #include "adb.h" |
| 25 | 25 | |
| 26 | 26 | #include <linux/fb.h> |
| @@ -169,7 +169,7 @@ extern int socket_network_client(const char *host, int port, int type); | ||
| 169 | 169 | extern int socket_loopback_server(int port, int type); |
| 170 | 170 | extern int socket_inaddr_any_server(int port, int type); |
| 171 | 171 | |
| 172 | -/* normally provided by <cutils/fdevent.h> */ | |
| 172 | +/* normally provided by "fdevent.h" */ | |
| 173 | 173 | |
| 174 | 174 | #define FDE_READ 0x0001 |
| 175 | 175 | #define FDE_WRITE 0x0002 |
| @@ -252,7 +252,7 @@ static __inline__ int adb_is_absolute_host_path( const char* path ) | ||
| 252 | 252 | |
| 253 | 253 | #else /* !_WIN32 a.k.a. Unix */ |
| 254 | 254 | |
| 255 | -#include <cutils/fdevent.h> | |
| 255 | +#include "fdevent.h" | |
| 256 | 256 | #include <cutils/sockets.h> |
| 257 | 257 | #include <cutils/properties.h> |
| 258 | 258 | #include <cutils/misc.h> |
| @@ -61,7 +61,6 @@ else | ||
| 61 | 61 | commonSources += \ |
| 62 | 62 | mspace.c \ |
| 63 | 63 | selector.c \ |
| 64 | - fdevent.c \ | |
| 65 | 64 | tztime.c \ |
| 66 | 65 | adb_networking.c \ |
| 67 | 66 | zygote.c |
Fork