openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Josh Gao 2016-11-14 21:53:49 +00:00 committed by Android (Google) Code Review
parent a7ba9ff00b a9c0ac0c46
commit b19b5fe08c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adb/Android.mk
View File

@ -84,9 +84,7 @@ ifeq ($(USE_SYSDEPS_WIN32),)
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))

12
adb/sockets.c
View File

@ -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)
{