PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor minadbd cleanup."

Browse Source
This commit is contained in:
Treehugger Robot
2016-06-17 04:02:38 +00:00
committed by Gerrit Code Review
parent 37450d7f42 24eb8a0643
commit a49c8a19da
4 changed files with 3 additions and 8 deletions
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;
} }