android: Switch from glob exports to select imports

src/new/apple_libc/mod.rs

@@ -0,0 +1,3 @@
+//! Entrypoint for Apple headers, usually found as part of the Xcode SDK.
+
+pub(crate) mod signal;

src/new/bionic_libc/mod.rs

@@ -0,0 +1,5 @@
+//! This directory maps to `bionic/libc/include` in the Android source.
+//!
+//! <https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/include/>
+
+pub(crate) mod sys;

src/new/bionic_libc/sys/mod.rs

@@ -0,0 +1,3 @@
+//! Directory: `sys/`
+
+pub(crate) mod socket;

src/new/bionic/sys/socket.rs → src/new/bionic_libc/sys/socket.rs

@@ -1,4 +1,4 @@
-//! Header: `bionic/libc/include/sys/socket.h`
+//! Header: `sys/socket.h`
 
 use crate::prelude::*;
 

src/new/mod.rs

@@ -20,17 +20,21 @@ cfg_if! {
         mod linux_uapi;
         pub(crate) use linux_uapi::*;
     } else if #[cfg(target_os = "android")] {
-        mod bionic;
-        pub use bionic::*;
+        mod bionic_libc;
+        pub(crate) use bionic_libc::*;
     } else if #[cfg(target_vendor = "apple")] {
-        mod apple;
-        pub(crate) use apple::*;
+        mod apple_libc;
+        mod apple_xnu;
+        pub(crate) use apple_libc::*;
+        pub(crate) use apple_xnu::*;
     }
 }
 
 // Headers we export
 cfg_if! {
-    if #[cfg(target_os = "linux")] {
+    if #[cfg(target_os = "android")] {
+        pub use sys::socket::*;
+    } else if #[cfg(target_os = "linux")] {
         pub use linux::can::bcm::*;
         pub use linux::can::j1939::*;
         pub use linux::can::raw::*;

triagebot.toml

@@ -34,7 +34,10 @@ trigger_files = [
 new_pr = true
 
 [autolabel."O-android"]
-trigger_files = ["src/unix/linux_like/android"]
+trigger_files = [
+    "src/new/bionic_libc",
+    "src/unix/linux_like/android",
+]
 
 [autolabel."O-arm"]
 trigger_files = [
@@ -77,7 +80,8 @@ trigger_files = ["src/unix/linux_like/mod.rs"]
 [autolabel."O-macos"]
 trigger_files = [
     "src/unix/bsd/apple",
-    "src/new/apple",
+    "src/new/apple_lib",
+    "src/new/apple_xnu",
 ]
 
 [autolabel."O-mips"]