tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor minadbd cleanup.

Browse source 
Distinguish our "services.cpp" more clearly from the regular adbd
"services.cpp", and remove a few useless includes of "sysdeps.h".

Change-Id: Ided4945a3ac5916133322ca7e95fa51add9abaa4
This commit is contained in:
Elliott Hughes 2016-06-15 15:12:17 -07:00
parent 59f04b9982
commit 24eb8a0643
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minadbd/Android.mk
View file

@ -13,7 +13,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
adb_main.cpp \ adb_main.cpp \
fuse_adb_provider.cpp \ fuse_adb_provider.cpp \
services.cpp \ minadbd_services.cpp \
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_MODULE := libminadbd LOCAL_MODULE := libminadbd

2
minadbd/adb_main.cpp
View file

@ -19,8 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "sysdeps.h"
#include "adb.h" #include "adb.h"
#include "adb_auth.h" #include "adb_auth.h"
#include "transport.h" #include "transport.h"

2
minadbd/fuse_adb_provider.cpp
View file

@ -19,8 +19,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "sysdeps.h"
#include "adb.h" #include "adb.h"
#include "adb_io.h" #include "adb_io.h"
#include "fuse_adb_provider.h" #include "fuse_adb_provider.h"

5
minadbd/services.cpp → minadbd/minadbd_services.cpp
View file

@ -21,11 +21,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "sysdeps.h"
#include "adb.h" #include "adb.h"
#include "fdevent.h" #include "fdevent.h"
#include "fuse_adb_provider.h" #include "fuse_adb_provider.h"
#include "sysdeps.h"
typedef struct stinfo stinfo; typedef struct stinfo stinfo;
@ -62,7 +61,7 @@ static void sideload_host_service(int sfd, void* data) {
static int create_service_thread(void (*func)(int, void *), void *cookie) { static int create_service_thread(void (*func)(int, void *), void *cookie) {
int s[2]; int s[2];
if(adb_socketpair(s)) { if (adb_socketpair(s)) {
printf("cannot create service socket pair\n"); printf("cannot create service socket pair\n");
return -1; return -1;
} }