commit b863067378109ce939693a9f6d6373e63614c2cb
author Josh Gao <jmgao@google.com> Thu Feb 07 23:02:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 07 23:02:55 2019 -0800
tree 7d506d186e458b3543ced3f24fad992ea182359a
parent ead7387e10466088c84a89c8a09b99deba33a65c
parent f074e78a7cb1591987dce37c75810a0b6aa1972a

Merge "adb: "support" O_CLOEXEC in adb_open on Windows."
am: 9c4fda6cd2

Change-Id: Ie24c95b84e62093cb63e79ec52b3d378c4531698

adb/sysdeps_win32.cpp

diff --git a/adb/sysdeps_win32.cpp b/adb/sysdeps_win32.cpp
index d587589..4c5d8cb 100644
--- a/adb/sysdeps_win32.cpp
+++ b/adb/sysdeps_win32.cpp
@@ -356,6 +356,9 @@
     DWORD desiredAccess = 0;
     DWORD shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
 
+    // CreateFileW is inherently O_CLOEXEC by default.
+    options &= ~O_CLOEXEC;
+
     switch (options) {
         case O_RDONLY:
             desiredAccess = GENERIC_READ;