Android fixes for Swift 6 SDK

Also requires main branch of swift-log and swift-system, awaiting release
PADL · Oct 1, 2024 · 4943765 · 4943765
1 parent 01a675d
commit 4943765
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/Examples/OCADevice/DeviceApp.swift b/Examples/OCADevice/DeviceApp.swift
@@ -17,6 +17,13 @@
 import Foundation
 import SwiftOCA
 import SwiftOCADevice
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif canImport(Android)
+import Android
+#endif
 
 final class DeviceEventDelegate: OcaDeviceEventDelegate {
   public func onEvent(_ event: SwiftOCA.OcaEvent, parameters: Data) async {}

diff --git a/Sources/SwiftOCA/OCA/OCF/DeviceAddressToString.swift b/Sources/SwiftOCA/OCA/OCF/DeviceAddressToString.swift
@@ -15,6 +15,13 @@
 //
 
 import Foundation
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif canImport(Android)
+import Android
+#endif
 
 public func deviceAddressToString(_ deviceAddress: Data) -> String {
   deviceAddress.withUnsafeBytes {

diff --git a/Sources/SwiftOCA/OCP.1/Ocp1Connection.swift b/Sources/SwiftOCA/OCP.1/Ocp1Connection.swift
@@ -43,10 +43,10 @@ public typealias OcaSubscriptionCallback = @Sendable (OcaEvent, Data) async thro
 package let SOCK_STREAM: Int32 = Darwin.SOCK_STREAM
 package let SOCK_DGRAM: Int32 = Darwin.SOCK_DGRAM
 #elseif os(Android)
-import CoreFoundation
+import Android
 
-package let SOCK_STREAM = Int32(Glibc.SOCK_STREAM)
-package let SOCK_DGRAM = Int32(Glibc.SOCK_DGRAM)
+package let SOCK_STREAM = Int32(Android.SOCK_STREAM)
+package let SOCK_DGRAM = Int32(Android.SOCK_DGRAM)
 #elseif canImport(Glibc)
 import CoreFoundation
 

diff --git a/Sources/SwiftOCADevice/OCC/ControlClasses/Agents/Grouper.swift b/Sources/SwiftOCADevice/OCC/ControlClasses/Agents/Grouper.swift
@@ -17,6 +17,13 @@
 import Foundation
 @_spi(SwiftOCAPrivate)
 import SwiftOCA
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif canImport(Android)
+import Android
+#endif
 
 private actor OcaConnectionBroker {
   static let shared = OcaConnectionBroker()

diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/CF/Ocp1CFController.swift b/Sources/SwiftOCADevice/OCP.1/Backend/CF/Ocp1CFController.swift
@@ -24,6 +24,13 @@ import SocketAddress
 @_spi(SwiftOCAPrivate)
 import SwiftOCA
 import SystemPackage
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif canImport(Android)
+import Android
+#endif
 
 protocol Ocp1CFControllerPrivate: Ocp1ControllerInternal,
   Ocp1ControllerInternalLightweightNotifyingInternal, Actor,

diff --git a/Sources/SwiftOCADevice/OCP.1/Backend/CF/Ocp1CFDeviceEndpoint.swift b/Sources/SwiftOCADevice/OCP.1/Backend/CF/Ocp1CFDeviceEndpoint.swift
@@ -25,6 +25,13 @@ import SocketAddress
 @_spi(SwiftOCAPrivate)
 import SwiftOCA
 import SystemPackage
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif canImport(Android)
+import Android
+#endif
 
 @OcaDevice
 public class Ocp1CFDeviceEndpoint: OcaBonjourRegistrableDeviceEndpoint,