diff --git a/Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift b/Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift index 9c066414e6b..3f4a9cac4d8 100644 --- a/Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift +++ b/Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift @@ -4,6 +4,8 @@ import Darwin import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #endif public extension Collection { diff --git a/Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift b/Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift index 1b5b30cbbd5..222c6f8ffa8 100644 --- a/Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift +++ b/Fixtures/Miscellaneous/EchoExecutable/Sources/secho/main.swift @@ -2,6 +2,8 @@ import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) + import Android #else import Darwin.C #endif diff --git a/Sources/Build/TestObservation.swift b/Sources/Build/TestObservation.swift index 98a8f5f8e1e..a86ff467547 100644 --- a/Sources/Build/TestObservation.swift +++ b/Sources/Build/TestObservation.swift @@ -132,6 +132,8 @@ public func generateTestObservationCode(buildParameters: BuildParameters) -> Str @_exported import WinSDK #elseif os(WASI) @_exported import WASILibc + #elseif canImport(Android) + @_exported import Android #else @_exported import Darwin.C #endif diff --git a/Sources/CoreCommands/SwiftCommandState.swift b/Sources/CoreCommands/SwiftCommandState.swift index 7d8e406a575..0a9fb012677 100644 --- a/Sources/CoreCommands/SwiftCommandState.swift +++ b/Sources/CoreCommands/SwiftCommandState.swift @@ -39,6 +39,8 @@ import Darwin import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #endif import func TSCBasic.exec diff --git a/Sources/PackageDescription/PackageDescription.swift b/Sources/PackageDescription/PackageDescription.swift index 73e61456a18..b3466f63bd7 100644 --- a/Sources/PackageDescription/PackageDescription.swift +++ b/Sources/PackageDescription/PackageDescription.swift @@ -10,13 +10,7 @@ // //===----------------------------------------------------------------------===// -#if canImport(Glibc) -@_implementationOnly import Glibc -#elseif canImport(Musl) -@_implementationOnly import Musl -#elseif canImport(Darwin) -@_implementationOnly import Darwin.C -#elseif canImport(ucrt) && canImport(WinSDK) +#if canImport(ucrt) && canImport(WinSDK) @_implementationOnly import ucrt @_implementationOnly import struct WinSDK.HANDLE #endif diff --git a/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift b/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift index 7158e605a81..555b382d5a6 100644 --- a/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift +++ b/Tests/PackageLoadingTests/PD_5_3_LoadingTests.swift @@ -505,17 +505,6 @@ final class PackageDescription5_3LoadingTests: PackageDescriptionLoadingTests { func testNonZeroExitStatusDoesNotAssert() async throws { let content = """ - #if canImport(Glibc) - import Glibc - #elseif canImport(Musl) - import Musl - #elseif os(Windows) - import MSVCRT - import WinSDK - #else - import Darwin.C - #endif - print("crash") exit(1) """