ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: a9c0ac0c46

Change-Id: Icc58ac512edaaa0a47dda375147a832214107556
This commit is contained in:
Josh Gao 2016-11-14 22:10:39 +00:00 • committed by android-build-merger
commit e4e1ed0e5b
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 LOCAL_STATIC_LIBRARIES += libcutils
endif endif
ifneq ($(HOST_OS),windows) include $(BUILD_HOST_EXECUTABLE)
include $(BUILD_HOST_EXECUTABLE)
endif
$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) $(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 #define TRACE_TAG TRACE_SOCKETS
#include "adb.h" #include "adb.h"
#if defined(__BIONIC__) static pthread_mutex_t socket_list_lock;
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER static void __attribute__((constructor)) socket_list_lock_init(void) {
#endif pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
static pthread_mutex_t socket_list_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&socket_list_lock, &attr);
}
int sendfailmsg(int fd, const char *reason) int sendfailmsg(int fd, const char *reason)
{ {