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

Commit b19b5fe0 authored by Josh Gao's avatar Josh Gao Committed by Android (Google) Code Review
Browse files

Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev

parents a7ba9ff0 a9c0ac0c

adb/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -84,9 +84,7 @@ ifeq ($(USE_SYSDEPS_WIN32),) 
	LOCAL_STATIC_LIBRARIES += libcutils

endif



ifneq ($(HOST_OS),windows)

include $(BUILD_HOST_EXECUTABLE)

endif



$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))

adb/sockets.c

+7 −5
Original line number Diff line number Diff line
@@ -27,11 +27,13 @@ 
#define  TRACE_TAG  TRACE_SOCKETS

#include "adb.h"



#if defined(__BIONIC__)

#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER

#endif



static pthread_mutex_t socket_list_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;

static pthread_mutex_t socket_list_lock;

static void __attribute__((constructor)) socket_list_lock_init(void) {

  pthread_mutexattr_t attr;

  pthread_mutexattr_init(&attr);

  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

  pthread_mutex_init(&socket_list_lock, &attr);

}



int sendfailmsg(int fd, const char *reason)

{