commit 9cf2dd1a9bb12e01a1da53cc89b80d3e8cfa9250
author Elliott Hughes <enh@google.com> Fri Jun 17 18:22:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 17 18:22:42 2016 +0000
tree d5009816eadc2f25cfaabf253ccc201adeee0863
parent 5475565761ccb9bf75039df63d6eaa92d9d86ea0
parent 62bd0a9cb1ed865c4727c174a3d9fedc515b44ad

Merge \\\\"Minor minadbd cleanup.\\\\" am: a49c8a19da am: 98c97c8932 am: aaa7c08cfa
am: 62bd0a9cb1

Change-Id: I292fd31cebd3df14fedf83bc591a0a602bf40128

minadbd/Android.mk

diff --git a/minadbd/Android.mk b/minadbd/Android.mk
index 3db3b41..b3bbb42 100644
--- a/minadbd/Android.mk
+++ b/minadbd/Android.mk
@@ -13,7 +13,7 @@
 LOCAL_SRC_FILES := \
     adb_main.cpp \
     fuse_adb_provider.cpp \
-    services.cpp \
+    minadbd_services.cpp \
 
 LOCAL_CLANG := true
 LOCAL_MODULE := libminadbd

minadbd/adb_main.cpp

diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index 0694280..8e581c2 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"

minadbd/fuse_adb_provider.cpp

diff --git a/minadbd/fuse_adb_provider.cpp b/minadbd/fuse_adb_provider.cpp
index d71807d..0f4c256 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"

minadbd/minadbd_services.cpp

diff --git a/minadbd/services.cpp b/minadbd/minadbd_services.cpp
similarity index 98%
rename from minadbd/services.cpp
rename to minadbd/minadbd_services.cpp
index 658a43f..003b519 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 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;
     }