Android: switch to the new swift-toolchain-sqlite package instead of requiring an external dependency #8148
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…requiring an external dependency
finagolfin
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
francescomikulis,
xedin,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand and
owenv
as code owners
finagolfin
commented
Nov 30, 2024
| @@ -76,7 +76,10 @@ let includeDynamicLibrary: Bool = false | |||
| let systemSQLitePkgConfig: String? = nil | |||
| #else | |||
| let includeDynamicLibrary: Bool = true | |||
| let systemSQLitePkgConfig: String? = "sqlite3" | |||
| var systemSQLitePkgConfig: String? = "sqlite3" | |||
| if ProcessInfo.processInfo.environment["SWIFTCI_INSTALL_RPATH_OS"] == "android" { | |||
There was a problem hiding this comment.
This is only set by the official build-script, so it will only work in that scenario, which is fine as most builds of this repo happen that way.
Eventually, systemLibrary dependencies should be conditional on the platform, but that is not available yet.
jakepetroules
approved these changes
Dec 2, 2024
|
@MaxDesiatov, need a CI run here. |
|
@swift-ci test |
|
Passed CI as expected, ready for merge. |
|
@jakepetroules, thanks for the quick review, would you be okay with getting this small patch into 6.1 next? It would allow me to retire it from my downstream patches. |
|
For SwiftPM, main is currently auto merged to 6.1 until Dec 20'th. No manual effort necessary. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've been building with this patch both natively on Android and on my Android CI, confirming that it got rid of the external dependency on
libsqlite3.soand works well.@jakepetroules, along with your recent llbuild pull, this gets rid of the external SQLite3 dependency for the Android toolchain except for one llbuild executable,
swift-build-tool, whose build is configured by CMake and appears to be unused, so we can clean that up last.