Merge pull request #23339 from Iced-Sun/master

alexrp · web-flow · commit db7db48028b7 · 2025-03-26T23:25:08.000+01:00
std.posix: update LFS64 interfaces for android bionic C
diff --git a/lib/std/Target.zig b/lib/std/Target.zig
@@ -482,7 +482,7 @@ pub const Os = struct {
 
                             break :blk default_min;
                         },
-                        .android = 14,
+                        .android = 24,
                     },
                 },
                 .rtems => .{
diff --git a/lib/std/posix.zig b/lib/std/posix.zig
@@ -7489,7 +7489,7 @@ pub fn ioctl_SIOCGIFINDEX(fd: fd_t, ifr: *ifreq) IoCtl_SIOCGIFINDEX_Error!void {
     }
 }
 
-const lfs64_abi = native_os == .linux and builtin.link_libc and builtin.abi.isGnu();
+const lfs64_abi = native_os == .linux and builtin.link_libc and (builtin.abi.isGnu() or builtin.abi.isAndroid());
 
 /// Whether or not `error.Unexpected` will print its value and a stack trace.
 ///

Original file line number	Diff line number	Diff line change
`@@ -7489,7 +7489,7 @@ pub fn ioctl_SIOCGIFINDEX(fd: fd_t, ifr: *ifreq) IoCtl_SIOCGIFINDEX_Error!void {`
`7489`	`7489`	`}`
`7490`	`7490`	`}`
`7491`	`7491`
`7492`		`-const lfs64_abi = native_os == .linux and builtin.link_libc and builtin.abi.isGnu();`
	`7492`	`+const lfs64_abi = native_os == .linux and builtin.link_libc and (builtin.abi.isGnu() or builtin.abi.isAndroid());`
`7493`	`7493`
`7494`	`7494`	/// Whether or not `error.Unexpected` will print its value and a stack trace.
`7495`	`7495`	`///`