commit 4f96bf83b4ad4d4ceb2858537834ce5860c8a431
author Josh Gao <jmgao@google.com> Thu Feb 07 23:07:30 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 07 23:07:30 2019 -0800
tree 73f0138a478ccb631df835115291a62ec14554d7
parent 2a5932ee4b64466d8f658ad150b2e86abce81631
parent b863067378109ce939693a9f6d6373e63614c2cb

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

Change-Id: I948af64e61e207a8698810a29d68fdfbf652dcff

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;