Android fixes

* ignore tests on some symbols that fail with bad function pointers
* detect termux app and link `libandroid-posix-semaphore` to fix link
  errors

Author: dead10ck

build.rs

@@ -24,6 +24,8 @@ const ALLOWED_CFGS: &[&str] = &[
     // Corresponds to `__USE_TIME_BITS64` in UAPI
     "linux_time_bits64",
     "musl_v1_2_3",
+    // termux
+    "termux",
 ];
 
 // Extra values to allow for check-cfg.
@@ -157,6 +159,11 @@ fn main() {
             }
         }
     }
+
+    // check for termux
+    if target_os == "android" && env::var("TERMUX_VERSION").is_ok() {
+        set_cfg("termux");
+    }
 }
 
 /// Run `rustc --version` and capture the output, adjusting arguments as needed if `clippy-driver`

libc-test/build.rs

@@ -68,7 +68,7 @@ fn do_ctest() {
         t if t.contains("windows") => test_windows(t),
         t if t.contains("vxworks") => test_vxworks(t),
         t if t.contains("nto-qnx") => test_neutrino(t),
-        t if t.contains("aix") => return test_aix(t),
+        t if t.contains("aix") => test_aix(t),
         t => panic!("unknown target {t}"),
     }
 }
@@ -2224,6 +2224,9 @@ fn test_android(target: &str) {
             // FIXME(android): Requires >= 6.12 kernel headers.
             "SOF_TIMESTAMPING_OPT_RX_FILTER" => true,
 
+            // FIXME(android): c value == 0 for some reason on termux
+            "TCSAFLUSH" => true,
+
             _ => false,
         }
     });
@@ -2288,7 +2291,10 @@ fn test_android(target: &str) {
             // FIXME(android): bad function pointers:
             "isalnum" | "isalpha" | "iscntrl" | "isdigit" | "isgraph" | "islower" | "isprint"
             | "ispunct" | "isspace" | "isupper" | "isxdigit" | "isblank" | "tolower"
-            | "toupper" => true,
+            | "toupper" | "getpwuid_r" | "tmpfile" | "getpwnam" | "getpwuid" | "tcdrain"
+            | "cfgetispeed" | "cfgetospeed" | "cfsetispeed" | "cfsetospeed" | "tcgetattr"
+            | "tcsetattr" | "tcflow" | "tcflush" | "tcgetsid" | "tcsendbreak" | "cfmakeraw"
+            | "cfsetspeed" => true,
 
             // Added in API level 24
             "if_nameindex" | "if_freenameindex" => true,
@@ -5564,7 +5570,7 @@ fn test_aix(target: &str) {
         "ACTION" => ty.to_string(),
 
         // 'sigval' is a struct in Rust, but a union in C.
-        "sigval" => format!("union sigval"),
+        "sigval" => "union sigval".to_string(),
 
         t if t.ends_with("_t") => t.to_string(),
         t if is_struct => format!("struct {}", t),

src/unix/linux_like/android/mod.rs

@@ -3590,6 +3590,9 @@ safe_f! {
     }
 }
 
+#[cfg_attr(termux, link(name = "android-posix-semaphore"))]
+extern "C" {}
+
 extern "C" {
     pub fn setgrent();
     pub fn endgrent();