Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62bd0a9c authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19 am: 98c97c89 

am: aaa7c08c

Change-Id: I331002cbe7a01841600cfd2162772f9f343b4fdf
parents 51265b64 aaa7c08c

minadbd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

minadbd/adb_main.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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/services.cpp→minadbd/minadbd_services.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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;