commit fd04d04bfacdbb31d55a2e3aa0e36f5720b04517
author Josh Gao <jmgao@google.com> Wed May 23 11:56:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 23 11:56:52 2018 -0700
tree d0ba5f670ad72a3b71b297922dea5cf45f6d90fe
parent efc07fea346e42fcef7e8d035cf8688d15dda78f
parent 5bf505a5834332f19245421e418a0c6100d51e54

Merge "Revert "adb: add support for O_CLOEXEC to unique_fd pipe wrapper.""
am: a2157a7d92

Change-Id: I8d9657c8f3ea7b1e1bebf5a7bb4b122173dc27fa

adb/adb_unique_fd.h

diff --git a/adb/adb_unique_fd.h b/adb/adb_unique_fd.h
index 0dd8687..9c02cbe 100644
--- a/adb/adb_unique_fd.h
+++ b/adb/adb_unique_fd.h
@@ -28,9 +28,9 @@
 using unique_fd = android::base::unique_fd_impl<AdbCloser>;
 
 #if !defined(_WIN32)
-inline bool Pipe(unique_fd* read, unique_fd* write, int flags = 0) {
+inline bool Pipe(unique_fd* read, unique_fd* write) {
     int pipefd[2];
-    if (pipe2(pipefd, flags) != 0) {
+    if (pipe(pipefd) != 0) {
         return false;
     }
     read->reset(pipefd[0]);