Auto merge of rust-lang#128416 - maurer:remove-android-hack, r=<try>

android: Remove libstd hacks for unsupported Android APIs

Our minimum supported API version is 21, remove hacks to support older Android APIs.

try-job: arm-android

r? tgross35

Author: bors

library/std/src/sys/pal/mod.rs

@@ -77,21 +77,14 @@ cfg_if::cfg_if! {
 }
 
 #[cfg(not(test))]
-cfg_if::cfg_if! {
-    if #[cfg(target_os = "android")] {
-        pub use self::android::log2f32;
-        pub use self::android::log2f64;
-    } else {
-        #[inline]
-        pub fn log2f32(n: f32) -> f32 {
-            unsafe { crate::intrinsics::log2f32(n) }
-        }
+#[inline]
+pub fn log2f32(n: f32) -> f32 {
+    unsafe { crate::intrinsics::log2f32(n) }
+}
 
-        #[inline]
-        pub fn log2f64(n: f64) -> f64 {
-            unsafe { crate::intrinsics::log2f64(n) }
-        }
-    }
+#[inline]
+pub fn log2f64(n: f64) -> f64 {
+    unsafe { crate::intrinsics::log2f64(n) }
 }
 
 #[cfg(not(target_os = "uefi"))]

library/std/src/sys/pal/unix/android.rs

@@ -8,7 +8,6 @@ use crate::io::ErrorKind;
 pub mod weak;
 
 pub mod alloc;
-pub mod android;
 pub mod args;
 pub mod env;
 pub mod fd;
@@ -237,12 +236,8 @@ pub unsafe fn cleanup() {
 }
 
 #[allow(unused_imports)]
-#[cfg(not(target_os = "android"))]
 pub use libc::signal;
 
-#[cfg(target_os = "android")]
-pub use crate::sys::android::signal;
-
 #[inline]
 pub(crate) fn is_interrupted(errno: i32) -> bool {
     errno == libc::EINTR