Revert "Make sem_wait able to return errno EINTR for sdk > 23."
Broke the build. There's no such file as bionic_sdk_version.h anywhere in the tree.
This reverts commit 892b61d3409e8cdf0e121c688737eb058d57f7ab.
Change-Id: Iec3f4588edfb1d1524bb5f16451fd05dc6ebe44a
diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp
index 734d86b..97d9e39 100644
--- a/libc/bionic/libc_init_dynamic.cpp
+++ b/libc/bionic/libc_init_dynamic.cpp
@@ -114,9 +114,3 @@
exit(slingshot(args.argc, args.argv, args.envp));
}
-
-extern "C" uint32_t android_get_application_target_sdk_version();
-
-uint32_t bionic_get_application_target_sdk_version() {
- return android_get_application_target_sdk_version();
-}
diff --git a/libc/bionic/libc_init_static.cpp b/libc/bionic/libc_init_static.cpp
index d1494d7..3cda1a2 100644
--- a/libc/bionic/libc_init_static.cpp
+++ b/libc/bionic/libc_init_static.cpp
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <android/api-level.h>
#include <elf.h>
#include <errno.h>
#include <stddef.h>
@@ -107,7 +106,3 @@
exit(slingshot(args.argc, args.argv, args.envp));
}
-
-uint32_t bionic_get_application_target_sdk_version() {
- return __ANDROID_API__;
-}
diff --git a/libc/bionic/semaphore.cpp b/libc/bionic/semaphore.cpp
index 1981647..b30c0b0 100644
--- a/libc/bionic/semaphore.cpp
+++ b/libc/bionic/semaphore.cpp
@@ -41,7 +41,6 @@
#include "private/bionic_constants.h"
#include "private/bionic_futex.h"
-#include "private/bionic_sdk_version.h"
#include "private/bionic_time_conversions.h"
// In this implementation, a semaphore contains a
@@ -221,13 +220,7 @@
return 0;
}
- int result = __futex_wait_ex(sem_count_ptr, shared, shared | SEMCOUNT_MINUS_ONE, false, nullptr);
- if (bionic_get_application_target_sdk_version() > 23) {
- if (result ==-EINTR) {
- errno = EINTR;
- return -1;
- }
- }
+ __futex_wait_ex(sem_count_ptr, shared, shared | SEMCOUNT_MINUS_ONE, false, nullptr);
}
}