diff options
| author | Elliott Hughes <enh@google.com> | 2016-06-17 20:22:42 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-17 20:22:42 +0200 |
| commit | 9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250 (patch) | |
| tree | d5009816eadc2f25cfaabf253ccc201adeee0863 | |
| parent | Check the results from applypatch am: 31f8cc84cf am: 93110c767f (diff) | |
| parent | Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19da am: 98c97c8932 (diff) | |
| download | android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.tar android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.tar.gz android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.tar.bz2 android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.tar.lz android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.tar.xz android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.tar.zst android_bootable_recovery-9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250.zip | |
| -rw-r--r-- | minadbd/Android.mk | 2 | ||||
| -rw-r--r-- | minadbd/adb_main.cpp | 2 | ||||
| -rw-r--r-- | minadbd/fuse_adb_provider.cpp | 2 | ||||
| -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 3db3b4114..b3bbb428c 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -13,7 +13,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ adb_main.cpp \ fuse_adb_provider.cpp \ - services.cpp \ + minadbd_services.cpp \ LOCAL_CLANG := true LOCAL_MODULE := libminadbd diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index 0694280cb..8e581c2a9 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -19,8 +19,6 @@ #include <stdio.h> #include <stdlib.h> -#include "sysdeps.h" - #include "adb.h" #include "adb_auth.h" #include "transport.h" diff --git a/minadbd/fuse_adb_provider.cpp b/minadbd/fuse_adb_provider.cpp index d71807dfb..0f4c2563d 100644 --- a/minadbd/fuse_adb_provider.cpp +++ b/minadbd/fuse_adb_provider.cpp @@ -19,8 +19,6 @@ #include <string.h> #include <errno.h> -#include "sysdeps.h" - #include "adb.h" #include "adb_io.h" #include "fuse_adb_provider.h" diff --git a/minadbd/services.cpp b/minadbd/minadbd_services.cpp index 658a43f36..003b51913 100644 --- a/minadbd/services.cpp +++ b/minadbd/minadbd_services.cpp @@ -21,11 +21,10 @@ #include <string.h> #include <unistd.h> -#include "sysdeps.h" - #include "adb.h" #include "fdevent.h" #include "fuse_adb_provider.h" +#include "sysdeps.h" 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) { int s[2]; - if(adb_socketpair(s)) { + if (adb_socketpair(s)) { printf("cannot create service socket pair\n"); return -1; } |