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

Commit cf41bbf3 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android (Google) Code Review
Browse files

Merge "adb: Only use properties on device builds"

parents d8b11c1d 893a4a47

adb/adb.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))



#if !ADB_HOST

#include <cutils/properties.h>

#include <private/android_filesystem_config.h>

#include <sys/capability.h>

#include <linux/prctl.h>

adb/services.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#  endif

#else

#  include <cutils/android_reboot.h>

#  include <cutils/properties.h>

#endif



typedef struct stinfo stinfo;

adb/sysdeps.h

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ extern char* adb_strtok_r(char *str, const char *delim, char **saveptr); 


#include "fdevent.h"

#include <cutils/sockets.h>

#include <cutils/properties.h>

#include <cutils/misc.h>

#include <signal.h>

#include <sys/wait.h>

adb/transport_local.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 


#include "sysdeps.h"

#include <sys/types.h>

#if !ADB_HOST

#include <cutils/properties.h>

#endif



#define  TRACE_TAG  TRACE_TRANSPORT

#include "adb.h"