-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Only apply patches to non-trunk branches on the CI because they've be…
…en upstreamed
- Loading branch information
1 parent
f86b18a
commit 35bc5d0
Showing
4 changed files
with
79 additions
and
57 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| diff --git a/sourcekit-lsp/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift b/sourcekit-lsp/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift | ||
| index 0be22ce8..33ca7ee5 100644 | ||
| --- a/sourcekit-lsp/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift | ||
| +++ b/sourcekit-lsp/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift | ||
| @@ -16,6 +16,9 @@ public import Foundation | ||
| public import LanguageServerProtocol | ||
| import SKLogging | ||
| import SwiftExtensions | ||
| +#if canImport(Android) | ||
| +import Android | ||
| +#endif | ||
| #else | ||
| import Dispatch | ||
| import Foundation | ||
| diff --git a/swiftpm/Package.swift b/swiftpm/Package.swift | ||
| index 48cd98431..6eaacae00 100644 | ||
| --- a/swiftpm/Package.swift | ||
| +++ b/swiftpm/Package.swift | ||
| @@ -76,7 +77,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" { | ||
| + systemSQLitePkgConfig = nil | ||
| +} | ||
| #endif | ||
|
|
||
| /** An array of products which have two versions listed: one dynamically linked, the other with the | ||
| @@ -199,7 +203,7 @@ let package = Package( | ||
| dependencies: [ | ||
| "_AsyncFileSystem", | ||
| .target(name: "SPMSQLite3", condition: .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux])), | ||
| - .product(name: "SwiftToolchainCSQLite", package: "swift-toolchain-sqlite", condition: .when(platforms: [.windows])), | ||
| + .product(name: "SwiftToolchainCSQLite", package: "swift-toolchain-sqlite", condition: .when(platforms: [.windows, .android])), | ||
| .product(name: "DequeModule", package: "swift-collections"), | ||
| .product(name: "OrderedCollections", package: "swift-collections"), | ||
| .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"), | ||
| diff --git a/swiftpm/Sources/Basics/SQLite.swift b/swiftpm/Sources/Basics/SQLite.swift | ||
| index 2ad235030..803490b48 100644 | ||
| --- a/swiftpm/Sources/Basics/SQLite.swift | ||
| +++ b/swiftpm/Sources/Basics/SQLite.swift | ||
| @@ -12,7 +12,7 @@ | ||
|
|
||
| import Foundation | ||
|
|
||
| -#if SWIFT_PACKAGE && os(Windows) | ||
| +#if SWIFT_PACKAGE && (os(Windows) || os(Android)) | ||
| #if USE_IMPL_ONLY_IMPORTS | ||
| @_implementationOnly import SwiftToolchainCSQLite | ||
| #else | ||
| From 355649608eb168652ff103d2a2029ba9539eea4b | ||
| From: Jake Petroules <[email protected]> | ||
| Date: Sun, 17 Nov 2024 02:21:37 -0800 | ||
| Subject: [PATCH] Fix the Android build | ||
| diff --git a/swift-tools-support-core/Sources/TSCUtility/Tracing.swift b/swift-tools-support-core/Sources/TSCUtility/Tracing.swift | ||
| index b53d26ca..418d4f84 100644 | ||
| --- a/swift-tools-support-core/Sources/TSCUtility/Tracing.swift | ||
| +++ b/swift-tools-support-core/Sources/TSCUtility/Tracing.swift | ||
| @@ -9,6 +9,7 @@ | ||
| */ | ||
|
|
||
| import Foundation | ||
| +import TSCLibc | ||
|
|
||
| public enum TracingEventType: String, Codable, Sendable { | ||
| case asyncBegin |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,16 +63,19 @@ diff --git a/sourcekit-lsp/Sources/sourcekit-lsp/SourceKitLSP.swift b/sourcekit- | |
|
|
||
| extension AbsolutePath { | ||
| public init?(argument: String) { | ||
| From 355649608eb168652ff103d2a2029ba9539eea4b | ||
| From: Jake Petroules <[email protected]> | ||
| Date: Sun, 17 Nov 2024 02:21:37 -0800 | ||
| Subject: [PATCH] Fix the Android build | ||
| diff --git a/swift-tools-support-core/Sources/TSCUtility/Tracing.swift b/swift-tools-support-core/Sources/TSCUtility/Tracing.swift | ||
| index b53d26ca..418d4f84 100644 | ||
| --- a/swift-tools-support-core/Sources/TSCUtility/Tracing.swift | ||
| +++ b/swift-tools-support-core/Sources/TSCUtility/Tracing.swift | ||
| @@ -9,6 +9,9 @@ | ||
| @@ -9,6 +9,7 @@ | ||
| */ | ||
|
|
||
| import Foundation | ||
| +#if canImport(Android) | ||
| +import Android | ||
| +#endif | ||
| +import TSCLibc | ||
|
|
||
| public enum TracingEventType: String, Codable, Sendable { | ||
| case asyncBegin | ||
|
|
||