Merge pull request #1802 from finagolfin/droid

swiftlang · Nov 5, 2024 · e73e8b7 · e73e8b7
2 parents 87b9285 + 7016b12
commit e73e8b7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 0 deletions.
diff --git a/Sources/SKSupport/Process+Run.swift b/Sources/SKSupport/Process+Run.swift
@@ -30,6 +30,8 @@ import struct TSCBasic.ProcessResult
 
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 extension Process {

diff --git a/Sources/sourcekit-lsp/SourceKitLSP.swift b/Sources/sourcekit-lsp/SourceKitLSP.swift
@@ -26,6 +26,10 @@ import SourceKitLSP
 import SwiftExtensions
 import ToolchainRegistry
 
+#if canImport(Android)
+import Android
+#endif
+
 public import struct TSCBasic.AbsolutePath
 public import struct TSCBasic.RelativePath
 public import var TSCBasic.localFileSystem

diff --git a/Tests/LanguageServerProtocolJSONRPCTests/ConnectionTests.swift b/Tests/LanguageServerProtocolJSONRPCTests/ConnectionTests.swift
@@ -19,6 +19,8 @@ import class Foundation.Pipe
 
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 class ConnectionTests: XCTestCase {

diff --git a/Tests/SKSupportTests/AsyncUtilsTests.swift b/Tests/SKSupportTests/AsyncUtilsTests.swift
@@ -18,6 +18,8 @@ import XCTest
 
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 final class AsyncUtilsTests: XCTestCase {

diff --git a/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift b/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift
@@ -20,6 +20,8 @@ import XCTest
 
 #if os(Windows)
 import WinSDK
+#elseif canImport(Android)
+import Android
 #endif
 
 final class PullDiagnosticsTests: XCTestCase {

diff --git a/Tests/ToolchainRegistryTests/ToolchainRegistryTests.swift b/Tests/ToolchainRegistryTests/ToolchainRegistryTests.swift
@@ -17,6 +17,10 @@ import XCTest
 
 import enum PackageLoading.Platform
 
+#if canImport(Android)
+import Android
+#endif
+
 final class ToolchainRegistryTests: XCTestCase {
   func testDefaultSingleToolchain() async throws {
     let tr = ToolchainRegistry(toolchains: [Toolchain(identifier: "a", displayName: "a", path: nil)])