Add Android support by finagolfin · Pull Request #222 · apple/swift-network-evolution

finagolfin · 2026-10-06T00:15:55Z

This package now compiles and all tests passed natively on Android built against API 24 with a Sep. 21 trunk snapshot toolchain and apple/swift-tls#23 applied to that dependency, though with the -Xswiftc -O flag added to work around swiftlang/swift#92886.

finagolfin · 2026-10-06T00:19:29Z

 internal import Logging
+#elseif canImport(Android)
+import Android
+internal import Logging


All these imports were added by a regex substitution, then manually reviewed.

finagolfin · 2026-10-06T00:21:40Z

+#if os(Linux) || os(Android)
 #if canImport(Glibc)
 import Glibc
+internal import SwiftNetworkLinuxShim


This linux shim works on Android, but I removed it since it's unneeded.

finagolfin · 2026-10-06T05:17:15Z

Rebased, added Android to CI, and made a formatting change to one file that the CI check wanted.

rpaulo · 2026-10-06T16:32:58Z

Looks like we need to fix this CI build error:

find: ‘/home/runner/work/swift-network-evolution/swift-network-evolution/.build/out/Products/Debug-android-x86_64’: No such file or directory
INFO         | Boot completed in 23943 ms
INFO         | Increasing screen off timeout, logcat buffer size to 2M.
WARNING      | adb command '/usr/local/lib/android/sdk/platform-tools/adb -s emulator-5554 shell cmd window set-ignore-orientation-request true ' failed: 'Unknown command: set-ignore-orientation-request'

I'm not familiar with Android, but do you know what's going on?

finagolfin · 2026-10-06T17:43:16Z

Oh, didn't notice that you are switching back to the native build system for the nightlies on CI, any reason you still have that? That is causing the above Android error for the 6.4.x nightlies, as the 6.4 release works fine for Android, where that flag is not applied. The trunk build hangs, as do all the other builds using the linux toolchain right now because of the compiler issue I linked.

rpaulo · 2026-10-06T18:01:22Z

Oh, didn't notice that you are switching back to the native build system for the nightlies on CI, any reason you still have that? That is causing the above Android error for the 6.4.x nightlies, as the 6.4 release works fine for Android, where that flag is not applied. The trunk build hangs, as do all the other builds using the linux toolchain right now because of the compiler issue I linked.

Are you saying that nightly-6.4 doesn't work on Android? If that's the case, we can disable it for now in your CI changes.

finagolfin · 2026-10-06T18:07:59Z

Are you saying that nightly-6.4 doesn't work on Android? If that's the case, we can disable it for now in your CI changes.

No, the issue is that the official GitHub workflows now only expect the Android SDK to be used with the swiftbuild build system, so they only look in that internal build directory for the test runners. I find it strange that you are still using the native build system for the nightlies alone on the CI here, do you know why that is?

rpaulo · 2026-10-06T18:31:40Z

I think the --build-system native flag was to work around an issue on 6.5 (maybe). I think it's worth removing it now to see if it's still needed.

finagolfin · 2026-10-06T18:38:02Z

OK, will try that here and see.

finagolfin · 2026-10-06T19:13:19Z

Hmm, most CI failing in this test that was added yesterday, some subsequent pull broke it?

rpaulo · 2026-10-06T21:03:25Z

Hmm, most CI failing in this test that was added yesterday, some subsequent pull broke it?

It's fixed now. Could you please rebase?

finagolfin · 2026-10-06T23:25:40Z

@rpaulo, rebased, please run CI.

finagolfin · 2026-10-07T00:23:27Z

The last rebase picked up a new linux/mac-only logging method: added it for Android and checked to make sure this branch builds on Android locally before updating now.

finagolfin · 2026-10-07T01:14:28Z

Alright, all non-trunk builds are passing now, including the nightly 6.4.x Android SDK snapshots once I removed the change to the native build system. How about we get the first commit here in for Android support, then I will submit a separate CI-only pull to clean up those workflows for all platforms?

rpaulo

The changes look good, minor small nits. Probably wait for #226 before rebasing.

finagolfin · 2026-10-07T01:25:05Z

No need to wait on #226, as all trunk builds fail because of the trunk compiler regression anyway.

agnosticdev

Thank you!

finagolfin · 2026-10-07T19:42:16Z

Simply rebased to pick up changes that should get main CI working too.

rpaulo · 2026-10-07T20:37:31Z

OK, now that #228 is merged, would the Android build succeed? If you think so, please rebase so we can try again.

finagolfin · 2026-10-07T20:47:05Z

Rebased to pull in those CI config changes, yes, Android with the trunk SDK should work now, since that pull switched it back to the default swiftbuild build system.

rnro

Looks great, thanks

rpaulo

Approved. I don't see the Swift Network tests running on Android yet, but we could try to fix that in another PR.

finagolfin · 2026-10-07T21:11:39Z

That is a separate issue with the official workflow that will be fixed upstream at some point, swiftlang/github-workflows#277.

rpaulo · 2026-10-07T22:29:14Z

                throw NetworkError.posix(error)
            }
+            #if canImport(Android)
+            guard let nameBuffer = if_indextoname(index, bufferAddress) else {


Our internal review system flagged this as not following Linux which uses System.syscallOptional and retries on EINTR and saves errno correctly. Could we use syscallOptional on Android as well?

Sure, I threw that out for Android because it was unnecessarily converting the index to Int and then back again to UInt and I didn't see the point to that method, but I suppose I can create UInt overloads for Android.

Added another commit that uses that method, tested as always by building and running the tests on my Android 16 phone, with this code first built against the Android 7 APIs.

finagolfin · 2026-10-08T07:27:34Z

Simply rebased to avoid an incorrect API breakage check from subsequently merged pulls

finagolfin · 2026-10-08T19:17:25Z

Thanks for the quick review. 👍

@Cartisim, please take a look if you'd like anything else added.

finagolfin requested review from agnosticdev, ekinnear, kkuk24, rpaulo and tfpauly as code owners October 6, 2026 00:15

finagolfin commented Oct 6, 2026

View reviewed changes

Comment thread Sources/SwiftNetwork/System/Darwin/DarwinResources.swift

finagolfin commented Oct 6, 2026

View reviewed changes

finagolfin mentioned this pull request Oct 6, 2026

Add Android support apple/swift-nio-quic#123

Open

finagolfin force-pushed the droid branch from d8227a3 to f8a65be Compare October 6, 2026 05:15

tfpauly mentioned this pull request Oct 6, 2026

Add Android Bionic support so SwiftNetwork builds on the Android SDK. #219

Closed

finagolfin force-pushed the droid branch from f8a65be to fb4c4cd Compare October 6, 2026 18:41

finagolfin commented Oct 6, 2026

View reviewed changes

Comment thread .github/workflows/main.yml Outdated

rpaulo added the 🆕 semver/minor Adds new public API. label Oct 6, 2026

finagolfin force-pushed the droid branch from fb4c4cd to 4a4b410 Compare October 6, 2026 18:46

rpaulo added 🔨 semver/patch No public API change. and removed 🆕 semver/minor Adds new public API. labels Oct 6, 2026

finagolfin commented Oct 6, 2026

View reviewed changes

Comment thread .github/workflows/pull_request.yml Outdated

finagolfin force-pushed the droid branch from 4a4b410 to 5451b5a Compare October 6, 2026 23:22

finagolfin force-pushed the droid branch from 5451b5a to 1104f33 Compare October 7, 2026 00:21

rpaulo reviewed Oct 7, 2026

View reviewed changes

Comment thread .github/workflows/pull_request.yml Outdated

finagolfin force-pushed the droid branch from 1104f33 to 7221e4d Compare October 7, 2026 01:20

rpaulo approved these changes Oct 7, 2026

View reviewed changes

agnosticdev approved these changes Oct 7, 2026

View reviewed changes

finagolfin force-pushed the droid branch from 7221e4d to 8797f14 Compare October 7, 2026 19:41

finagolfin force-pushed the droid branch from 8797f14 to 59f67b0 Compare October 7, 2026 20:43

rnro approved these changes Oct 7, 2026

View reviewed changes

rpaulo approved these changes Oct 7, 2026

View reviewed changes

rpaulo reviewed Oct 7, 2026

View reviewed changes

finagolfin added 2 commits October 8, 2026 12:55

Add Android support

16bb8cb

Tweak how a couple Bionic functions are called

f1367cd

finagolfin force-pushed the droid branch from 1d10766 to f1367cd Compare October 8, 2026 07:26

tfpauly approved these changes Oct 8, 2026

View reviewed changes

rpaulo merged commit 244c452 into apple:main Oct 8, 2026
42 checks passed

finagolfin deleted the droid branch October 8, 2026 19:19

Conversation

finagolfin commented Oct 6, 2026

Uh oh!

finagolfin Oct 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

finagolfin Oct 6, 2026

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Oct 6, 2026

Uh oh!

rpaulo commented Oct 6, 2026

Uh oh!

finagolfin commented Oct 6, 2026

Uh oh!

rpaulo commented Oct 6, 2026

Uh oh!

finagolfin commented Oct 6, 2026

Uh oh!

rpaulo commented Oct 6, 2026

Uh oh!

finagolfin commented Oct 6, 2026

Uh oh!

Uh oh!

Uh oh!

finagolfin commented Oct 6, 2026

Uh oh!

rpaulo commented Oct 6, 2026

Uh oh!

finagolfin commented Oct 6, 2026

Uh oh!

finagolfin commented Oct 7, 2026

Uh oh!

finagolfin commented Oct 7, 2026

Uh oh!

Uh oh!

rpaulo left a comment

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Oct 7, 2026

Uh oh!

agnosticdev left a comment

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Oct 7, 2026

Uh oh!

rpaulo commented Oct 7, 2026

Uh oh!

finagolfin commented Oct 7, 2026

Uh oh!

rnro left a comment

Choose a reason for hiding this comment

Uh oh!

rpaulo left a comment

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Oct 7, 2026

Uh oh!

rpaulo Oct 7, 2026

Choose a reason for hiding this comment

Uh oh!

finagolfin Oct 7, 2026

Choose a reason for hiding this comment

Uh oh!

finagolfin Oct 8, 2026

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Oct 8, 2026

Uh oh!

Uh oh!

finagolfin commented Oct 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!