Merge pull request #5149 from finagolfin/main

[android] Use Bionic imports instead where possible

Author: finagolfin

Sources/Foundation/FileManager.swift

@@ -21,8 +21,8 @@ import WinSDK
 
 #if os(WASI)
 import WASILibc
-#elseif canImport(Android)
-import Android
+#elseif canImport(Bionic)
+import Bionic
 #endif
 
 #if os(Windows)

Sources/Foundation/NSLock.swift

@@ -11,8 +11,8 @@
 
 #if canImport(Glibc)
 import Glibc
-#elseif canImport(Android)
-import Android
+#elseif canImport(Bionic)
+import Bionic
 #endif
 
 #if os(Windows)

Sources/Foundation/NSURL.swift

@@ -22,8 +22,8 @@ import Darwin
 import Glibc
 #elseif canImport(Musl)
 import Musl
-#elseif canImport(Android)
-import Android
+#elseif canImport(Bionic)
+import Bionic
 #endif
 
 // NOTE: this represents PLATFORM_PATH_STYLE

Sources/Foundation/Thread.swift

@@ -17,8 +17,8 @@ import WinSDK
 import Glibc
 #elseif canImport(Musl)
 import Musl
-#elseif canImport(Android)
-import Android
+#elseif canImport(Bionic)
+import Bionic
 #endif
 
 // WORKAROUND_SR9811

Sources/Testing/Testing.swift

@@ -11,6 +11,8 @@
 import Glibc
 #elseif canImport(Musl)
 import Musl
+#elseif canImport(Bionic)
+import Bionic
 #elseif os(WASI)
 import WASILibc
 #elseif canImport(CRT)

Sources/plutil/main.swift

@@ -15,9 +15,9 @@ import Glibc
 #elseif canImport(Musl)
 import Foundation
 import Musl
-#elseif canImport(Android)
+#elseif canImport(Bionic)
 import Foundation
-import Android
+import Bionic
 #elseif canImport(CRT)
 import Foundation
 import CRT

Sources/xdgTestHelper/main.swift

@@ -19,7 +19,7 @@ import FoundationNetworking
 #endif
 #if os(Windows)
 import WinSDK
-#elseif os(Android)
+#elseif canImport(Android)
 import Android
 #endif