Skip to content

Commit 0b46bf5

Browse files
committed
[Android] Use the Bionic module in more places
Also, use `canImport()` wherever importing APIs, reserving `os(Android)` for platform differences.
1 parent 8f26c08 commit 0b46bf5

29 files changed

+51
-51
lines changed

Sources/FoundationEssentials/Calendar/Calendar.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#if canImport(Darwin)
1414
internal import os
15-
#elseif os(Android)
16-
import Android
15+
#elseif canImport(Bionic)
16+
import Bionic
1717
#elseif canImport(Glibc)
1818
import Glibc
1919
#elseif canImport(CRT)

Sources/FoundationEssentials/Calendar/Calendar_Gregorian.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#if canImport(os)
1414
internal import os
15-
#elseif os(Android)
16-
import Android
15+
#elseif canImport(Bionic)
16+
import Bionic
1717
#elseif canImport(Glibc)
1818
import Glibc
1919
#elseif canImport(CRT)

Sources/FoundationEssentials/CodableUtilities.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#if canImport(Darwin)
1414
import Darwin
15-
#elseif os(Android)
15+
#elseif canImport(Bionic)
1616
import Bionic
1717
#elseif canImport(Glibc)
1818
import Glibc

Sources/FoundationEssentials/Data/Data+Reading.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal import _FoundationCShims
1818

1919
#if canImport(Darwin)
2020
import Darwin
21-
#elseif os(Android)
21+
#elseif canImport(Android)
2222
import Android
2323
#elseif canImport(Glibc)
2424
import Glibc
@@ -375,7 +375,7 @@ internal func readBytesFromFile(path inPath: PathOrURL, reportProgress: Bool, ma
375375
localProgress?.completedUnitCount = 1
376376
} else if shouldMap {
377377
#if !NO_FILESYSTEM
378-
#if os(Android)
378+
#if canImport(Android)
379379
let bytes = mmap(nil, Int(fileSize), PROT_READ, MAP_PRIVATE, fd, 0)
380380
if bytes == UnsafeMutableRawPointer(bitPattern: -1) {
381381
throw CocoaError.errorWithFilePath(inPath, errno: errno, reading: true)

Sources/FoundationEssentials/Data/Data+Writing.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal import _FoundationCShims
1919

2020
#if canImport(Darwin)
2121
import Darwin
22-
#elseif os(Android)
22+
#elseif canImport(Android)
2323
import Android
2424
import unistd
2525
#elseif canImport(Glibc)

Sources/FoundationEssentials/Data/Data.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@usableFromInline let memset = ucrt.memset
1818
@usableFromInline let memcpy = ucrt.memcpy
1919
@usableFromInline let memcmp = ucrt.memcmp
20-
#elseif os(Android)
20+
#elseif canImport(Bionic)
2121
import Bionic
2222
@usableFromInline let calloc = Bionic.calloc
2323
@usableFromInline let malloc = Bionic.malloc

Sources/FoundationEssentials/Date.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#if canImport(Darwin)
1414
import Darwin
15-
#elseif os(Android)
15+
#elseif canImport(Bionic)
1616
import Bionic
1717
#elseif canImport(Glibc)
1818
import Glibc

Sources/FoundationEssentials/Decimal/Decimal+Math.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#if canImport(Darwin)
1414
import Darwin
15-
#elseif os(Android)
16-
import Android
15+
#elseif canImport(Bionic)
16+
import Bionic
1717
#elseif canImport(Glibc)
1818
import Glibc
1919
#elseif canImport(CRT)

Sources/FoundationEssentials/Error/CocoaError+FilePath.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal import _ForSwiftFoundation
1515

1616
#if canImport(Darwin)
1717
import Darwin
18-
#elseif os(Android)
18+
#elseif canImport(Bionic)
1919
import Bionic
2020
#elseif canImport(Glibc)
2121
import Glibc

Sources/FoundationEssentials/Error/ErrorCodes+POSIX.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//===----------------------------------------------------------------------===//
1111

1212
// Import for POSIXErrorCode
13-
#if os(Android)
13+
#if canImport(Android)
1414
@preconcurrency import Android
1515
#elseif canImport(Glibc)
1616
@preconcurrency import Glibc

0 commit comments

Comments
 (0)