linux: Move types.h API to src/new

Link: https://github.com/torvalds/linux/blob/dc59e4fea9d83f03bad6bddf3fa2e52491777482/include/uapi/linux/types.h
Link: https://github.com/torvalds/linux/blob/dc59e4fea9d83f03bad6bddf3fa2e52491777482/include/uapi/asm-generic/types.h
Link: https://github.com/torvalds/linux/blob/dc59e4fea9d83f03bad6bddf3fa2e52491777482/include/uapi/asm-generic/int-ll64.h
Link: https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/kernel/uapi/linux/types.h;drc=180edefbd287c39caeb9d48784a9a10ac35f3636
Link: https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/kernel/uapi/asm-generic/types.h;drc=180edefbd287c39caeb9d48784a9a10ac35f3636
Link: https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/kernel/uapi/asm-generic/int-ll64.h;drc=180edefbd287c39caeb9d48784a9a10ac35f3636

Author: tgross35

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;

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;

src/new/bionic_libc/kernel_uapi/mod.rs

@@ -0,0 +1,3 @@
+//! Directory: `bionic/libc/kernel/uapi`
+
+pub(crate) mod linux;

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;

src/new/linux_uapi/linux/mod.rs

@@ -11,3 +11,4 @@ pub(crate) mod membarrier;
 pub(crate) mod mount;
 pub(crate) mod netlink;
 pub(crate) mod pidfd;
+pub(crate) mod types;

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;

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::*;
@@ -188,6 +190,7 @@ cfg_if! {
         pub use linux::mount::*;
         pub use linux::netlink::*;
         pub use linux::pidfd::*;
+        pub use linux::types::*;
         #[cfg(target_env = "gnu")]
         pub use net::route::*;
     } else if #[cfg(target_vendor = "apple")] {

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`

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 {

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 {