commit 9dcf23fae36572d28f28685f8db53d657b761f85
author Josh Gao <jmgao@google.com> Fri Apr 17 14:10:59 2020 -0700
committer Josh Gao <jmgao@google.com> Fri Apr 17 14:46:41 2020 -0700
tree 922ee77c6ef9e477db05fcdd15c8fdf6c0dfde82
parent 8195bc48d48f2614294a7a615c4cb75d2cf228f6

adbconnection: delete unnecessary darwin workaround.

This shouldn't be compiling for the mac.

Test: none
Change-Id: I9aea1861365c0da041c665e14e3e86cb802ad697

libs/adbconnection/adbconnection_client.cpp

diff --git a/libs/adbconnection/adbconnection_client.cpp b/libs/adbconnection/adbconnection_client.cpp
index b569421..c132342 100644
--- a/libs/adbconnection/adbconnection_client.cpp
+++ b/libs/adbconnection/adbconnection_client.cpp
@@ -122,16 +122,7 @@
     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;