rust-lang · tgross35 · Jun 30, 2026 · Jun 30, 2026
diff --git a/src/new/bionic_libc/kernel_uapi/linux/mod.rs b/src/new/bionic_libc/kernel_uapi/linux/mod.rs
@@ -0,0 +1,5 @@
+//! Directory: `bionic/libc/kernel/uapi/linux/`
+//!
+//! <https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/kernel/uapi/linux/>
+
+pub(crate) mod types;
diff --git a/src/new/bionic_libc/kernel_uapi/linux/types.rs b/src/new/bionic_libc/kernel_uapi/linux/types.rs
@@ -0,0 +1,21 @@
+//! * Header: `bionic/libc/kernel/uapi/linux/types.h`
+//! * Header: `bionic/libc/kernel/uapi/asm-generic/int-ll64.h`
+
+use crate::prelude::*;
+
+/* Definitions from `asm/types.h` -> `asm-generic/types.h` -> `asm-generic/int-ll64.h` */
+
+pub type __u8 = c_uchar;
+
+pub type __u16 = c_ushort;
+pub type __s16 = c_short;
+
+pub type __u32 = c_uint;
+pub type __s32 = c_int;
+
+pub type __s64 = c_longlong;
+pub type __u64 = c_ulonglong;
+
+/* From `uapi/linux/types.h` */
+
+pub type __be16 = __u16;
diff --git a/src/new/bionic_libc/kernel_uapi/mod.rs b/src/new/bionic_libc/kernel_uapi/mod.rs
@@ -0,0 +1,3 @@
+//! Directory: `bionic/libc/kernel/uapi`
+
+pub(crate) mod linux;
diff --git a/src/new/bionic_libc/mod.rs b/src/new/bionic_libc/mod.rs
@@ -1,7 +1,10 @@
-//! This directory maps to `bionic/libc/include` in the Android source.
+//! This directory maps to `bionic/libc/include` in the Android source. `bionic/libc/kernel` is
+//! the source of UAPI definitions, which are a cleaned form of the default Linux headers.
 //!
-//! <https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/include/>
+//! <https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/include/>,
+//! <https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/kernel/uapi/>
 
+pub(crate) mod kernel_uapi;
 pub(crate) mod pthread;
 pub(crate) mod sys;
 pub(crate) mod unistd;
diff --git a/src/new/linux_uapi/linux/mod.rs b/src/new/linux_uapi/linux/mod.rs
@@ -13,3 +13,4 @@ pub(crate) mod netlink;
 pub(crate) mod pidfd;
 pub(crate) mod sctp;
 pub(crate) mod tls;
+pub(crate) mod types;
diff --git a/src/new/linux_uapi/linux/types.rs b/src/new/linux_uapi/linux/types.rs
@@ -0,0 +1,17 @@
+//! * Header: `uapi/linux/types.h`
+//! * Header: `uapi/asm-generic/int-ll64.h`
+
+use crate::prelude::*;
+
+/* Definitions from `asm/types.h` -> `asm-generic/types.h` -> `asm-generic/int-ll64.h` */
+
+pub type __u8 = c_uchar;
+
+pub type __u16 = c_ushort;
+pub type __s16 = c_short;
+
+pub type __u32 = c_uint;
+pub type __s32 = c_int;
+
+pub type __s64 = c_longlong;
+pub type __u64 = c_ulonglong;
diff --git a/src/new/mod.rs b/src/new/mod.rs
@@ -173,6 +173,8 @@ cfg_if! {
 // Per-OS headers we export
 cfg_if! {
     if #[cfg(target_os = "android")] {
+        use bionic_libc::kernel_uapi::linux;
+        pub use linux::types::*;
         pub use sys::socket::*;
     } else if #[cfg(target_os = "linux")] {
         pub use linux::can::bcm::*;
@@ -190,6 +192,7 @@ cfg_if! {
         pub use linux::pidfd::*;
         pub use linux::sctp::*;
         pub use linux::tls::*;
+        pub use linux::types::*;
         #[cfg(target_env = "gnu")]
         pub use net::route::*;
     } else if #[cfg(target_vendor = "apple")] {

diff --git a/src/unix/linux_like/android/b32/mod.rs b/src/unix/linux_like/android/b32/mod.rs
@@ -8,8 +8,6 @@ pub type off64_t = c_longlong;
 pub type sigset_t = c_ulong;
 pub type socklen_t = i32;
 pub type time64_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     // FIXME(1.0): This should not implement `PartialEq`

diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs
@@ -2,8 +2,6 @@ use crate::off64_t;
 use crate::prelude::*;
 
 pub type wchar_t = u32;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     pub struct stat {

diff --git a/src/unix/linux_like/android/b64/riscv64/mod.rs b/src/unix/linux_like/android/b64/riscv64/mod.rs
@@ -3,8 +3,6 @@ use crate::prelude::*;
 
 pub type wchar_t = u32;
 pub type greg_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     pub struct stat {

diff --git a/src/unix/linux_like/android/b64/x86_64/mod.rs b/src/unix/linux_like/android/b64/x86_64/mod.rs
@@ -3,8 +3,6 @@ use crate::prelude::*;
 
 pub type wchar_t = i32;
 pub type greg_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     pub struct stat {

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -41,13 +41,6 @@ pub type loff_t = c_longlong;
 pub type __kernel_loff_t = c_longlong;
 pub type __kernel_pid_t = c_int;
 
-pub type __u8 = c_uchar;
-pub type __u16 = c_ushort;
-pub type __s16 = c_short;
-pub type __u32 = c_uint;
-pub type __s32 = c_int;
-pub type __be16 = __u16;
-
 // linux/elf.h
 
 pub type Elf32_Addr = u32;

diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs
@@ -9,8 +9,6 @@ pub type shmatt_t = c_ulong;
 pub type msgqnum_t = c_ulong;
 pub type msglen_t = c_ulong;
 pub type nlink_t = u32;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 pub type __fsword_t = i32;
 pub type fsblkcnt64_t = u64;
 pub type fsfilcnt64_t = u64;

diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -10,8 +10,6 @@ pub type wchar_t = u32;
 pub type nlink_t = u32;
 pub type blksize_t = i32;
 pub type suseconds_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     // FIXME(1.0): This should not implement `PartialEq`

diff --git a/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs
@@ -10,8 +10,6 @@ pub type wchar_t = i32;
 pub type blksize_t = i32;
 pub type nlink_t = u32;
 pub type suseconds_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     pub struct stat {

diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs
@@ -9,8 +9,6 @@ pub type blksize_t = i64;
 pub type nlink_t = u64;
 pub type suseconds_t = i64;
 pub type wchar_t = i32;
-pub type __u64 = c_ulong;
-pub type __s64 = c_long;
 
 s! {
     pub struct stat {

diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
@@ -11,8 +11,6 @@ pub type wchar_t = i32;
 pub type nlink_t = u64;
 pub type blksize_t = i64;
 pub type suseconds_t = i64;
-pub type __u64 = c_ulong;
-pub type __s64 = c_long;
 pub type gregset_t = [c_ulong; __NGREG];
 pub type fpregset_t = [c_ulong; __NFPREG];
 

diff --git a/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs b/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs
@@ -14,8 +14,6 @@ pub type blksize_t = c_int;
 pub type fsblkcnt64_t = c_ulong;
 pub type fsfilcnt64_t = c_ulong;
 pub type suseconds_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     pub struct pthread_attr_t {

diff --git a/src/unix/linux_like/linux/gnu/b64/s390x.rs b/src/unix/linux_like/linux/gnu/b64/s390x.rs
@@ -12,8 +12,6 @@ pub type nlink_t = u64;
 pub type suseconds_t = i64;
 pub type wchar_t = i32;
 pub type greg_t = u64;
-pub type __u64 = u64;
-pub type __s64 = i64;
 
 s! {
     // FIXME(1.0): This should not implement `PartialEq`

diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs
@@ -11,8 +11,6 @@ pub type wchar_t = i32;
 pub type nlink_t = u32;
 pub type blksize_t = i64;
 pub type suseconds_t = i32;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     // FIXME(1.0): This should not implement `PartialEq`

diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
@@ -11,8 +11,6 @@ pub type nlink_t = u64;
 pub type blksize_t = i64;
 pub type greg_t = i64;
 pub type suseconds_t = i64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     // FIXME(1.0): This should not implement `PartialEq`

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -1,6 +1,12 @@
 //! Linux-specific definitions for linux-like values
 use crate::prelude::*;
 use crate::{
+    __s16,
+    __s32,
+    __u16,
+    __u32,
+    __u64,
+    __u8,
     sock_filter,
     _IO,
     _IOR,
@@ -26,12 +32,6 @@ pub type pthread_spinlock_t = c_int;
 pub type __kernel_fsid_t = __c_anonymous__kernel_fsid_t;
 pub type __kernel_clockid_t = c_int;
 
-pub type __u8 = c_uchar;
-pub type __u16 = c_ushort;
-pub type __s16 = c_short;
-pub type __u32 = c_uint;
-pub type __s32 = c_int;
-
 pub type eventfd_t = u64;
 
 c_enum! {

diff --git a/src/unix/linux_like/linux/musl/b32/mod.rs b/src/unix/linux_like/linux/musl/b32/mod.rs
@@ -2,8 +2,6 @@ use crate::prelude::*;
 
 pub type nlink_t = u32;
 pub type blksize_t = c_long;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 pub type regoff_t = c_int;
 
 s! {

diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
@@ -1,8 +1,6 @@
 use crate::off_t;
 use crate::prelude::*;
 
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 pub type wchar_t = u32;
 pub type nlink_t = u32;
 pub type blksize_t = c_int;

diff --git a/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
@@ -7,8 +7,6 @@ pub type wchar_t = c_int;
 
 pub type nlink_t = c_uint;
 pub type blksize_t = c_int;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 pub type stat64 = stat;
 

diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs
@@ -2,8 +2,6 @@ use crate::off_t;
 use crate::prelude::*;
 
 pub type wchar_t = i32;
-pub type __u64 = c_ulong;
-pub type __s64 = c_long;
 pub type nlink_t = c_uint;
 pub type blksize_t = i64;
 

diff --git a/src/unix/linux_like/linux/musl/b64/powerpc64.rs b/src/unix/linux_like/linux/musl/b64/powerpc64.rs
@@ -2,8 +2,6 @@ use crate::off_t;
 use crate::prelude::*;
 
 pub type wchar_t = i32;
-pub type __u64 = c_ulong;
-pub type __s64 = c_long;
 pub type nlink_t = u64;
 pub type blksize_t = c_long;
 

diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
@@ -7,8 +7,6 @@ pub type wchar_t = c_int;
 
 pub type nlink_t = c_uint;
 pub type blksize_t = c_int;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 pub type stat64 = stat;
 

diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs
@@ -5,8 +5,6 @@ pub type blksize_t = i64;
 pub type nlink_t = u64;
 pub type wchar_t = i32;
 pub type greg_t = u64;
-pub type __u64 = u64;
-pub type __s64 = i64;
 pub type statfs64 = statfs;
 pub type stat64 = stat;
 

diff --git a/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs b/src/unix/linux_like/linux/musl/b64/wasm32/mod.rs
@@ -6,8 +6,6 @@ use crate::prelude::*;
 pub type wchar_t = i32;
 pub type nlink_t = u64;
 pub type blksize_t = c_long;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 pub type stat64 = stat;
 

diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
@@ -4,8 +4,6 @@ use crate::prelude::*;
 pub type wchar_t = i32;
 pub type nlink_t = u64;
 pub type blksize_t = c_long;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 pub type greg_t = i64;
 
 pub type stat64 = stat;

diff --git a/src/unix/linux_like/linux/uclibc/arm/mod.rs b/src/unix/linux_like/linux/uclibc/arm/mod.rs
@@ -16,8 +16,6 @@ pub type blkcnt_t = c_long;
 
 pub type fsblkcnt64_t = u64;
 pub type fsfilcnt64_t = u64;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 
 s! {
     pub struct cmsghdr {

diff --git a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
@@ -10,8 +10,6 @@ pub type blksize_t = i32;
 pub type nlink_t = u32;
 pub type fsblkcnt_t = c_ulong;
 pub type fsfilcnt_t = c_ulong;
-pub type __u64 = c_ulonglong;
-pub type __s64 = c_longlong;
 pub type fsblkcnt64_t = u64;
 pub type fsfilcnt64_t = u64;
 

diff --git a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs
@@ -19,8 +19,6 @@ pub type pthread_t = c_ulong;
 
 pub type fsblkcnt64_t = u64;
 pub type fsfilcnt64_t = u64;
-pub type __u64 = c_ulong;
-pub type __s64 = c_long;
 
 s! {
     pub struct ipc_perm {

diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -247,10 +247,10 @@ cfg_if! {
 
             // linux/filter.h
             pub struct sock_filter {
-                pub code: __u16,
-                pub jt: __u8,
-                pub jf: __u8,
-                pub k: __u32,
+                pub code: crate::__u16,
+                pub jt: crate::__u8,
+                pub jf: crate::__u8,
+                pub k: crate::__u32,
             }
 
             pub struct sock_fprog {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		//! Directory: `bionic/libc/kernel/uapi`

		pub(crate) mod linux;