6df961257
Chris Renshaw
2015-12-17
Subject
Resolve linker issues with Android API 21 (dprintf, tcdrain)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/platform.h+6 -1
| @@ -481,9 +481,14 @@ typedef unsigned smalluint; | |
| #if defined(ANDROID) || defined(__ANDROID__) | |
| # if __ANDROID_API__ < 8 | |
| + | /* ANDROID < 8 has no [f]dprintf at all */ |
| # undef HAVE_DPRINTF | |
| - | # else |
| + | # elif __ANDROID_API__ < 21 |
| + | /* ANDROID < 21 has fdprintf */ |
| # define dprintf fdprintf | |
| + | # else |
| + | /* ANDROID >= 21 has standard dprintf */ |
| + | # endif |
| # endif | |
| # if __ANDROID_API__ < 21 | |
| # undef HAVE_TTYNAME_R | |
libbb/missing_syscalls.c+2 -0
| @@ -40,8 +40,10 @@ int pivot_root(const char *new_root, const char *put_old) | |
| return syscall(__NR_pivot_root, new_root, put_old); | |
| } | |
| + | # if __ANDROID_API__ < 21 |
| int tcdrain(int fd) | |
| { | |
| return ioctl(fd, TCSBRK, 1); | |
| } | |
| + | # endif |
| #endif | |