openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: fix mac build." 

am: 925b410c7f

Change-Id: I24661973196be25fb3d031c1b389b34082f6af8a
This commit is contained in:
Josh Gao 2018-05-24 11:24:53 -07:00 committed by android-build-merger
parent a2d48a633f 925b410c7f
commit d743ebc829
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adb/adb_unique_fd.h
View File

@ -16,6 +16,7 @@
#pragma once
#include <errno.h>
#include <unistd.h>
#include <android-base/unique_fd.h>
@ -48,14 +49,18 @@ inline bool Pipe(unique_fd* read, unique_fd* write, int flags = 0) {
if (flags & O_CLOEXEC) {
if (fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) != 0 ||
fcntl(pipefd[1], F_SETFD, FD_CLOEXEC) != 0) {
PLOG(FATAL) << "failed to set FD_CLOEXEC on newly created pipe";
close(pipefd[0]);
close(pipefd[1]);
return false;
}
}
if (flags & O_NONBLOCK) {
if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) != 0 ||
fcntl(pipefd[1], F_SETFL, O_NONBLOCK) != 0) {
PLOG(FATAL) << "failed to set O_NONBLOCK on newly created pipe";
close(pipefd[0]);
close(pipefd[1]);
return false;
}
}
#endif