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

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

am: ddf0740c08

Change-Id: I82ec8fe1bd14a0e80bd4cd57ca4958d5999eea3a
This commit is contained in:
Josh Gao 2016-11-14 22:26:10 +00:00 committed by android-build-merger
parent 3bd49af10b ddf0740c08
commit 8b88eb368a
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

@ -82,9 +82,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

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