Merge "Sync internal and external master."

am: 42f3bd0ffc

Change-Id: I949286a4a4ceb597de82f6309d728595cf6b3c25
This commit is contained in:
Elliott Hughes 2017-10-04 00:15:54 +00:00 committed by android-build-merger
commit e8f384c61b

View file

@ -784,12 +784,6 @@ TEST(UNISTD_TEST, _POSIX_macros_smoke) {
EXPECT_GT(_XOPEN_IOV_MAX, 0);
EXPECT_GT(_XOPEN_UNIX, 0);
// In O, the headers still have -1 (even though all the functionality has
// been there for a long time). This was fixed in O-DR, but there isn't a
// separate CTS for O-DR, so we'll accept both.
EXPECT_TRUE(_POSIX_THREAD_PROCESS_SHARED == -1 ||
_POSIX_THREAD_PROCESS_SHARED == _POSIX_VERSION);
#if defined(__BIONIC__)
// These tests only pass on bionic, as bionic and glibc has different support on these macros.
// Macros like _POSIX_ASYNCHRONOUS_IO are not supported on bionic yet.