aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-06-15 17:12:17 -0500
committerElliott Hughes2016-06-16 21:57:20 -0500
commit24eb8a0643d50b636c77ffa8f3e23c7c3a8f5bf9 (patch)
tree0e50c6b196154b16ff9772d38c4e4ed362556890 /minadbd
parent59f04b998212e4fbbc2ed77d70052f1175f1ca05 (diff)
downloadplatform-bootable-recovery-24eb8a0643d50b636c77ffa8f3e23c7c3a8f5bf9.tar.gz
platform-bootable-recovery-24eb8a0643d50b636c77ffa8f3e23c7c3a8f5bf9.tar.xz
platform-bootable-recovery-24eb8a0643d50b636c77ffa8f3e23c7c3a8f5bf9.zip
Minor minadbd cleanup.
Distinguish our "services.cpp" more clearly from the regular adbd "services.cpp", and remove a few useless includes of "sysdeps.h". Change-Id: Ided4945a3ac5916133322ca7e95fa51add9abaa4
Diffstat (limited to 'minadbd')
-rw-r--r--minadbd/Android.mk2
-rw-r--r--minadbd/adb_main.cpp2
-rw-r--r--minadbd/fuse_adb_provider.cpp2
-rw-r--r--minadbd/minadbd_services.cpp (renamed from minadbd/services.cpp)5
4 files changed, 3 insertions, 8 deletions
diff --git a/minadbd/Android.mk b/minadbd/Android.mk
index 3db3b411..b3bbb428 100644
--- a/minadbd/Android.mk
+++ b/minadbd/Android.mk
@@ -13,7 +13,7 @@ include $(CLEAR_VARS)
13LOCAL_SRC_FILES := \ 13LOCAL_SRC_FILES := \
14 adb_main.cpp \ 14 adb_main.cpp \
15 fuse_adb_provider.cpp \ 15 fuse_adb_provider.cpp \
16 services.cpp \ 16 minadbd_services.cpp \
17 17
18LOCAL_CLANG := true 18LOCAL_CLANG := true
19LOCAL_MODULE := libminadbd 19LOCAL_MODULE := libminadbd
diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index 0694280c..8e581c2a 100644
--- a/minadbd/adb_main.cpp
+++ b/minadbd/adb_main.cpp
@@ -19,8 +19,6 @@
19#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h> 20#include <stdlib.h>
21 21
22#include "sysdeps.h"
23
24#include "adb.h" 22#include "adb.h"
25#include "adb_auth.h" 23#include "adb_auth.h"
26#include "transport.h" 24#include "transport.h"
diff --git a/minadbd/fuse_adb_provider.cpp b/minadbd/fuse_adb_provider.cpp
index d71807df..0f4c2563 100644
--- a/minadbd/fuse_adb_provider.cpp
+++ b/minadbd/fuse_adb_provider.cpp
@@ -19,8 +19,6 @@
19#include <string.h> 19#include <string.h>
20#include <errno.h> 20#include <errno.h>
21 21
22#include "sysdeps.h"
23
24#include "adb.h" 22#include "adb.h"
25#include "adb_io.h" 23#include "adb_io.h"
26#include "fuse_adb_provider.h" 24#include "fuse_adb_provider.h"
diff --git a/minadbd/services.cpp b/minadbd/minadbd_services.cpp
index 658a43f3..003b5191 100644
--- a/minadbd/services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -21,11 +21,10 @@
21#include <string.h> 21#include <string.h>
22#include <unistd.h> 22#include <unistd.h>
23 23
24#include "sysdeps.h"
25
26#include "adb.h" 24#include "adb.h"
27#include "fdevent.h" 25#include "fdevent.h"
28#include "fuse_adb_provider.h" 26#include "fuse_adb_provider.h"
27#include "sysdeps.h"
29 28
30typedef struct stinfo stinfo; 29typedef struct stinfo stinfo;
31 30
@@ -62,7 +61,7 @@ static void sideload_host_service(int sfd, void* data) {
62 61
63static int create_service_thread(void (*func)(int, void *), void *cookie) { 62static int create_service_thread(void (*func)(int, void *), void *cookie) {
64 int s[2]; 63 int s[2];
65 if(adb_socketpair(s)) { 64 if (adb_socketpair(s)) {
66 printf("cannot create service socket pair\n"); 65 printf("cannot create service socket pair\n");
67 return -1; 66 return -1;
68 } 67 }