commit 8b88eb368a8717f13f2e03377f8bcaf72249bc26
author Josh Gao <jmgao@google.com> Mon Nov 14 22:26:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 14 22:26:10 2016 +0000
tree 7c97f2a545dff277a4a33ac21bfd31226db934a9
parent 3bd49af10bc607cd91f3e535a5b9dd9aa1a22b05
parent ddf0740c085df54b5e420763b26573894dd526d9

adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b
am: ddf0740c08

Change-Id: I82ec8fe1bd14a0e80bd4cd57ca4958d5999eea3a

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 974867e..af7d7e5 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -82,9 +82,7 @@
 	LOCAL_STATIC_LIBRARIES += libcutils
 endif
 
-ifneq ($(HOST_OS),windows)
-  include $(BUILD_HOST_EXECUTABLE)
-endif
+include $(BUILD_HOST_EXECUTABLE)
 
 $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
 

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index 29df706..cf8baed0 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -30,11 +30,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)
 {