Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 414ff7d9 authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

Move fdevent from libcutils into adb directory. ADB is the only client of this... 

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.
parent b415390e

adb/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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 \

libcutils/fdevent.c→adb/fdevent.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <stdarg.h>

#include <stddef.h>



#include <cutils/fdevent.h>

#include "fdevent.h"



#define TRACE(x...) fprintf(stderr,x)

include/cutils/fdevent.h→adb/fdevent.h

+0 −0

File moved.

View file

adb/framebuffer_service.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <string.h>

#include <fcntl.h>



#include <cutils/fdevent.h>

#include "fdevent.h"

#include "adb.h"



#include <linux/fb.h>

adb/sysdeps.h

+2 −2
Original line number Diff line number Diff line
@@ -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>