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

macOS build fix: no SOCK_CLOEXEC on darwin.

Browse source 
We can't use the sysdeps.h copy of this code, so for now add yet
another copy & paste. We should come up with something better in
libbase, but let's get the macOS build fixed first.

Test: builds on mac
Change-Id: Ifb059990d7091f3d91b54e684f4ee14afe69c28b
This commit is contained in:
Elliott Hughes 2020-04-14 16:12:17 -07:00
parent 00c2625fd1
commit cbe30fb952
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/libs/adbconnection/adbconnection_client.cpp
View file

@ -122,7 +122,16 @@ AdbConnectionClientContext* adbconnection_client_new(
return nullptr;
}
#if defined(__APPLE__)
ctx->control_socket_.reset(socket(AF_UNIX, SOCK_SEQPACKET, 0));
// TODO: find a better home for all these copies of the mac CLOEXEC workaround.
if (int fd = ctx->control_socket_.get(), flags = fcntl(fd, F_GETFD);
flags != -1 && (flags & FD_CLOEXEC) == 0) {
fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
}
#else
ctx->control_socket_.reset(socket(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0));
#endif
if (ctx->control_socket_ < 0) {
PLOG(ERROR) << "failed to create Unix domain socket";
return nullptr;