Skip to content

Commit

Permalink
Remove another upstreamed patch from the CI
Browse files Browse the repository at this point in the history
  • Loading branch information
finagolfin committed Dec 4, 2024
1 parent 35bc5d0 commit 2995cd5
Showing 1 changed file with 0 additions and 38 deletions.
38 changes: 0 additions & 38 deletions swift-android-ci-devel.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,6 @@ index 0be22ce8..33ca7ee5 100644
#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 <jake.petroules@apple.com>
Date: Sun, 17 Nov 2024 02:21:37 -0800
Expand Down

0 comments on commit 2995cd5

Please sign in to comment.