Skip to content

Commit add120c

Browse files
committed
Import new Android overlay or Bionic module
Also, fix build error because `strsignal()` always returns `_Nonnull` in the latest Android NDK 26.
1 parent 01d4294 commit add120c

File tree

6 files changed

+16
-0
lines changed

6 files changed

+16
-0
lines changed

Sources/SwiftDriver/Driver/ToolExecutionDelegate.swift

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import WinSDK
1919
import Glibc
2020
#elseif canImport(Musl)
2121
import Musl
22+
#elseif canImport(Bionic)
23+
import Bionic
2224
#else
2325
#error("Missing libc or equivalent")
2426
#endif
@@ -136,7 +138,11 @@ import var TSCBasic.stdoutStream
136138
}
137139
#else
138140
case .signalled(let signal):
141+
#if canImport(Bionic)
142+
let errorMessage = String(cString: strsignal(signal))
143+
#else
139144
let errorMessage = strsignal(signal).map { String(cString: $0) } ?? ""
145+
#endif
140146
messages = constructJobSignalledMessages(job: job, error: errorMessage, output: output,
141147
signal: signal, pid: pid).map {
142148
ParsableMessage(name: job.kind.rawValue, kind: .signalled($0))

Sources/SwiftDriver/SwiftScan/Loader.swift

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import Darwin
2121
import Glibc
2222
#elseif canImport(Musl)
2323
import Musl
24+
#elseif canImport(Android)
25+
import Android
2426
#endif
2527

2628
internal enum Loader {

Sources/SwiftDriver/Utilities/DateAdditions.swift

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import Darwin
1818
import Glibc
1919
#elseif canImport(Musl)
2020
import Musl
21+
#elseif canImport(Bionic)
22+
import Bionic
2123
#endif
2224

2325
/// Represents a time point value with nanosecond precision.

Sources/SwiftDriver/Utilities/System.swift

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import Darwin
1616
import Glibc
1717
#elseif canImport(Musl)
1818
import Musl
19+
#elseif canImport(Android)
20+
import Android
1921
#endif
2022

2123
func argumentNeedsQuoting(_ argument: String) -> Bool {

Sources/swift-build-sdk-interfaces/main.swift

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import Darwin
1919
import Glibc
2020
#elseif canImport(Musl)
2121
import Musl
22+
#elseif canImport(Bionic)
23+
import Bionic
2224
#endif
2325

2426
import class TSCBasic.DiagnosticsEngine

Sources/swift-driver/main.swift

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import Darwin
2020
import Glibc
2121
#elseif canImport(Musl)
2222
import Musl
23+
#elseif canImport(Android)
24+
import Android
2325
#endif
2426

2527
import Dispatch

0 commit comments

Comments
 (0)