commit 2c58e1924a7bf1b44049764fddb40c1704dc288f
author Ian Kasprzak <iankaz@google.com> Thu Apr 25 15:59:28 2019 +0000
committer Ian Kasprzak <iankaz@google.com> Thu Apr 25 15:59:28 2019 +0000
tree ac108140764b894ac24b6dceba42f7061fd6424f
parent 93d63c010ae24ff58acb70216bfcb93e3c73019a

Revert "Add a way to turn off unique_fd's operator int."

This reverts commit 93d63c010ae24ff58acb70216bfcb93e3c73019a.

Reason for revert: b/131312539 - All aosp-master-with-phones phones failing boot / health check.

Change-Id: Id4239f93484b7d6b8d9bcd355a59cbd40d9766e2

adb/adb_utils.h

diff --git a/adb/adb_utils.h b/adb/adb_utils.h
index 2988034..5800a62 100644
--- a/adb/adb_utils.h
+++ b/adb/adb_utils.h
@@ -26,7 +26,6 @@
 #include <android-base/macros.h>
 
 #include "adb.h"
-#include "adb_unique_fd.h"
 
 void close_stdin();
 
@@ -52,7 +51,7 @@
 [[noreturn]] void error_exit(const char* fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
 [[noreturn]] void perror_exit(const char* fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
 
-bool set_file_block_mode(borrowed_fd fd, bool block);
+bool set_file_block_mode(int fd, bool block);
 
 // Given forward/reverse targets, returns true if they look sane. If an error is found, fills
 // |error| and returns false.