Add android support, that uses new swift-foundation for Android by hyp · Pull Request #5024 · swiftlang/swift-corelibs-foundation

hyp · 2024-07-23T03:05:29Z

Requires swiftlang/swift-foundation#757

hyp · 2024-07-23T03:12:59Z

@swift-ci please test

hyp · 2024-07-23T03:13:54Z

Supersedes #4994

hyp · 2024-07-23T03:14:09Z

CC @parkera

parkera · 2024-07-23T16:16:53Z

@hyp Android support is not part of Swift 6, correct?

hyp · 2024-08-06T20:35:50Z

This depends on swiftlang/swift-foundation#714 now.

hyp · 2024-08-06T20:38:04Z

@parkera Sorry for the late reply! Android overlay support is included in Swift 6, so this should be taken into Swift 6 as well.

hyp · 2024-08-06T20:38:32Z

@swift-ci please test

finagolfin · 2024-08-07T03:15:46Z

                            let (showFile, skipDescendants) = match(filename: filename, to: _options, isDir: true)
                            if skipDescendants {
-                                fts_set(_stream, _current, FTS_SKIP)
+                                fts_set(stream, _current!, FTS_SKIP)


Use current instead.

compnerd · 2024-08-07T15:50:33Z

@swift-ci please test

finagolfin · 2024-08-07T16:07:51Z

 #endif
 #if os(Windows)
 import WinSDK
+#elseif os(Android)


canImport(Android)

Never mind, I modified this in my pull hyp#1 instead.

This change can still be made.

parkera · 2024-08-26T18:08:37Z

Which swift-foundation change does this rely on now?

finagolfin · 2024-08-27T05:03:28Z

None, as the one he opened is now obsolete. However, I have proposed further changes to this pull in hyp#1 and haven't gotten any response.

parkera · 2024-08-27T17:35:23Z

@compnerd can you help with this one?

compnerd

Seems good to me!

compnerd · 2024-08-27T19:13:19Z

+#if TARGET_OS_ANDROID
+#define HAVE_STRLCPY 1
+#define HAVE_STRLCAT 1
+#endif


I think that we should consider doing this via the build configuration.

I think we've been doing this in the headers because build configuration is spread across several systems (cmake, SPM), and they do not all support the same features.

Instead of setting this separately here, can you just add TARGET_OS_ANDROID to the list below? That's how I do it on my CI.

finagolfin · 2024-09-12T07:38:02Z

@hyp, any reason this is just sitting here? I can submit these commits and mine from hyp#1 separately if you don't have time for this.

finagolfin · 2024-12-03T13:38:36Z

Ping @hyp, I've been using a version of this pull along with my own modifications on my Android CI. I think we should go ahead with some version of this.

If you're unable to work on this pull further, I can rebase this pull, add my own mods, and submit it in another pull.

Let us know what you'd like to do.

hyp · 2024-12-11T05:03:56Z

Working on merging this in

hyp · 2024-12-11T20:04:30Z

@swift-ci please test

hyp · 2024-12-11T20:04:59Z

testing a merge first, need to rebase it again though

hyp · 2024-12-11T21:38:19Z

@swift-ci please test

hyp · 2024-12-11T21:39:41Z

@swift-ci please test

hyp · 2024-12-12T04:04:40Z

@swift-ci please test windows platform

The windows host builds with the old driver for now, so it doesn't yet support wmo

hyp · 2024-12-12T04:11:29Z

@swift-ci please test

hyp · 2024-12-12T04:11:58Z

There was a change missing related to turning off WMO for a windows host but now it's fixed too. Should be ready to merge (pending windows CI too 🤞 )

hyp · 2024-12-12T04:13:55Z

@swift-ci please test windows platform

finagolfin

Mostly good, with some small tweaks pointed out.

finagolfin · 2024-12-12T07:14:50Z

+#if TARGET_OS_ANDROID
+#define HAVE_STRLCPY 1
+#define HAVE_STRLCAT 1
+#endif


Instead of setting this separately here, can you just add TARGET_OS_ANDROID to the list below? That's how I do it on my CI.

finagolfin · 2024-12-12T07:26:30Z

        var spawnAttrs: posix_spawnattr_t = posix_spawnattr_t()
+#endif
+#if os(Android)
+        guard var spawnAttrs else {


This doesn't make any sense, as it is set to nil just 5 lines above, so this causes this code to always fail.

Maybe you needed this guard in some previous iteration of this patch, but it is no longer needed.

Thanks, you're correct! It looks like I can't get rid of it yet, but the nullability on the NDK is broken for posix_spawnattr_init. I will follow-up with a nullability annotation change and with a change that removes that then.

OK, let me know when you get that annotation change up, as I will need it too.

I will follow this pull up with my own changes later today, mostly minor stuff like importing Bionic instead where possible.

@hyp, any progress with that annotation change? I'd like to delete this block in this repo, like I have to do on my Android CI.

finagolfin · 2024-12-12T07:27:22Z

 #endif
 #if os(Windows)
 import WinSDK
+#elseif os(Android)


This change can still be made.

hyp · 2024-12-12T19:05:57Z

@swift-ci please test

hyp · 2024-12-12T19:06:07Z

@swift-ci please test windows platform

hyp · 2024-12-12T19:08:17Z

@swift-ci please test

hyp · 2024-12-12T19:08:21Z

@swift-ci please test windows platform

hyp · 2024-12-12T19:08:58Z

@swift-ci please test windows platform

marcprux · 2024-12-13T14:48:21Z

Great to see this land!

@finagolfin, does this mean that we'll be able to drop swift-android.patch for trunk? Or will it need to be split up into separate patches, since the modifications to, e.g., build-script-impl are not covered by this PR?

finagolfin · 2024-12-13T18:10:16Z

The latter, because this is applied to all three Swift 6 release branches on my CI and this pull only got it into trunk.

finagolfin reviewed Jul 24, 2024

View reviewed changes

Comment thread Sources/Foundation/FileManager+POSIX.swift Outdated

finagolfin reviewed Jul 24, 2024

View reviewed changes

Comment thread Sources/Foundation/NSSwiftRuntime.swift

hyp force-pushed the eng/recore-android-build branch from 41466f4 to 94dc57f Compare August 6, 2024 20:34

finagolfin reviewed Aug 7, 2024

View reviewed changes

compnerd reviewed Aug 7, 2024

View reviewed changes

Comment thread Sources/Foundation/FileManager+POSIX.swift Outdated

finagolfin reviewed Aug 7, 2024

View reviewed changes

compnerd approved these changes Aug 27, 2024

View reviewed changes

finagolfin mentioned this pull request Dec 11, 2024

[android] Fix package manifest and one Bionic function's API version #5144

Merged

hyp and others added 3 commits December 11, 2024 13:36

Merge commit '246b3474fd4cb91d13b5ecb8fb5175aa6b50aa1e' into github/main

9b2dde9

Fix fts_open now that apinotes are applied

7f4bf4b

Update Sources/Foundation/FileManager+POSIX.swift

5f40cce

hyp force-pushed the eng/recore-android-build branch from 5ccdee3 to 5f40cce Compare December 11, 2024 21:37

fix Port.swift conditional

e505ccf

Ensure that the Android build on a windows host doesn't turn on WMO yet

90c4f5c

The windows host builds with the old driver for now, so it doesn't yet support wmo

finagolfin reviewed Dec 12, 2024

View reviewed changes

[android] fix pthread flag inclusion in libxml2 package

70ce513

review fixes

1da58eb

hyp force-pushed the eng/recore-android-build branch from de4bb96 to 1da58eb Compare December 12, 2024 19:07

hyp merged commit 4c3228c into swiftlang:main Dec 12, 2024

finagolfin mentioned this pull request Dec 17, 2024

[6.1][Android] Get this repo building again #5151

Merged

marcprux mentioned this pull request Jan 10, 2025

Override nullability annotations in local NDK headers finagolfin/swift-android-sdk#200

Closed

This was referenced Feb 18, 2025

Remove incorrect guard check for Android #5171

Merged

[6.1] Remove incorrect guard check for Android (#5171) #5175

Merged

marcprux added the Android label Dec 26, 2025

Uh oh!

Conversation

hyp commented Jul 23, 2024

Uh oh!

hyp commented Jul 23, 2024

Uh oh!

hyp commented Jul 23, 2024

Uh oh!

hyp commented Jul 23, 2024

Uh oh!

parkera commented Jul 23, 2024

Uh oh!

Uh oh!

Uh oh!

hyp commented Aug 6, 2024

Uh oh!

hyp commented Aug 6, 2024

Uh oh!

hyp commented Aug 6, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

compnerd commented Aug 7, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parkera commented Aug 26, 2024

Uh oh!

finagolfin commented Aug 27, 2024

Uh oh!

parkera commented Aug 27, 2024

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Sep 12, 2024

Uh oh!

finagolfin commented Dec 3, 2024

Uh oh!

hyp commented Dec 11, 2024

Uh oh!

hyp commented Dec 11, 2024

Uh oh!

hyp commented Dec 11, 2024

Uh oh!

hyp commented Dec 11, 2024

Uh oh!

hyp commented Dec 11, 2024

Uh oh!

hyp commented Dec 12, 2024

Uh oh!

hyp commented Dec 12, 2024

Uh oh!

hyp commented Dec 12, 2024

Uh oh!

hyp commented Dec 12, 2024

Uh oh!

finagolfin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment