commit a7edb68cd44bf6a73c7a8c607acb47b85178d046
author Raman Tenneti <rtenneti@google.com> Tue Nov 12 18:52:12 2019 +0000
committer Raman Tenneti <rtenneti@google.com> Tue Nov 12 18:52:12 2019 +0000
tree c4c6d7bbaab5425d66f38c65d6d5ea65794a8cca
parent c1db3bcba363992a8357d34f383a98e5500c0a79

Revert "fix 'adb shell'"

This reverts commit cc6d793310ad81d64a18d111ab33043791b92a52.

Reason for revert: Device boot failure. Conflicts while reverting dancol's CL.

Change-Id: Ic6929f20a60369b6f88f3caa22258e52d700f485

adb/sysdeps.h

diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 0c5a6b4..979413a 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -355,8 +355,8 @@
 
 static __inline__ void close_on_exec(borrowed_fd fd) {
     int flags = get_fd_flags(fd);
-    if (flags >= 0 && (flags & FD_CLOEXEC) == 0) {
-        fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
+    if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
+        fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
     }
 }