Skip to content

Commit 7afdeaa

Browse files
committed
Import new Bionic module from Android overlay instead where possible
Also, add the import in `Environment.swift` too
1 parent 8edc018 commit 7afdeaa

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Fixtures/DependencyResolution/External/Complex/FisherYates/src/Fisher-Yates_Shuffle.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import Darwin
44
import Glibc
55
#elseif canImport(Musl)
66
import Musl
7-
#elseif canImport(Android)
8-
import Android
7+
#elseif canImport(Bionic)
8+
import Bionic
99
#endif
1010

1111
public extension Collection {

Sources/Basics/Environment/Environment.swift

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import Musl
1919
#elseif os(Windows)
2020
import CRT
2121
import WinSDK
22+
#elseif canImport(Bionic)
23+
import Bionic
2224
#else
2325
import Darwin.C
2426
#endif

Sources/Build/TestObservation.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public func generateTestObservationCode(buildParameters: BuildParameters) -> Str
132132
@_exported import WinSDK
133133
#elseif os(WASI)
134134
@_exported import WASILibc
135-
#elseif canImport(Android)
136-
@_exported import Android
135+
#elseif canImport(Bionic)
136+
@_exported import Bionic
137137
#else
138138
@_exported import Darwin.C
139139
#endif

Sources/CoreCommands/SwiftCommandState.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import Darwin
3939
import Glibc
4040
#elseif canImport(Musl)
4141
import Musl
42-
#elseif canImport(Android)
43-
import Android
42+
#elseif canImport(Bionic)
43+
import Bionic
4444
#endif
4545

4646
import func TSCBasic.exec

0 commit comments

Comments
 (0)