From 9ca2942abd39791ba54184f419c5acf557a58fba Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Thu, 4 Jul 2024 02:20:23 +0530 Subject: [PATCH 1/2] Import new Android overlay --- Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift | 4 +++- Sources/SKSupport/dlopen.swift | 2 ++ Sources/SourceKitD/SKDRequestArray.swift | 2 ++ Sources/SourceKitD/SKDRequestDictionary.swift | 2 ++ Sources/SourceKitD/SKDResponse.swift | 2 ++ Sources/SourceKitD/SKDResponseArray.swift | 2 ++ Sources/SourceKitD/SKDResponseDictionary.swift | 2 ++ 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift b/Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift index e9967f64c..0630fe533 100644 --- a/Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift +++ b/Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift @@ -14,9 +14,11 @@ import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #endif -#if canImport(Glibc) || canImport(Musl) +#if canImport(Glibc) || canImport(Musl) || canImport(Android) // This is a lazily initialised global variable that when read for the first time, will ignore SIGPIPE. private let globallyIgnoredSIGPIPE: Bool = { /* no F_SETNOSIGPIPE on Linux :( */ diff --git a/Sources/SKSupport/dlopen.swift b/Sources/SKSupport/dlopen.swift index 4adf5b44a..07573da15 100644 --- a/Sources/SKSupport/dlopen.swift +++ b/Sources/SKSupport/dlopen.swift @@ -19,6 +19,8 @@ import Darwin import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #endif public final class DLHandle { diff --git a/Sources/SourceKitD/SKDRequestArray.swift b/Sources/SourceKitD/SKDRequestArray.swift index a68c4ae30..f8aed9d72 100644 --- a/Sources/SourceKitD/SKDRequestArray.swift +++ b/Sources/SourceKitD/SKDRequestArray.swift @@ -18,6 +18,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT +#elseif canImport(Android) +import Android #endif extension SourceKitD { diff --git a/Sources/SourceKitD/SKDRequestDictionary.swift b/Sources/SourceKitD/SKDRequestDictionary.swift index 99e025024..7ff965bc5 100644 --- a/Sources/SourceKitD/SKDRequestDictionary.swift +++ b/Sources/SourceKitD/SKDRequestDictionary.swift @@ -19,6 +19,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT +#elseif canImport(Android) +import Android #endif /// Values that can be stored in a `SKDRequestDictionary`. diff --git a/Sources/SourceKitD/SKDResponse.swift b/Sources/SourceKitD/SKDResponse.swift index 6f7ec1ba2..a48af403f 100644 --- a/Sources/SourceKitD/SKDResponse.swift +++ b/Sources/SourceKitD/SKDResponse.swift @@ -19,6 +19,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT +#elseif canImport(Android) +import Android #endif public final class SKDResponse: Sendable { diff --git a/Sources/SourceKitD/SKDResponseArray.swift b/Sources/SourceKitD/SKDResponseArray.swift index c2d4da582..79c32ee50 100644 --- a/Sources/SourceKitD/SKDResponseArray.swift +++ b/Sources/SourceKitD/SKDResponseArray.swift @@ -18,6 +18,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT +#elseif canImport(Android) +import Android #endif public final class SKDResponseArray: Sendable { diff --git a/Sources/SourceKitD/SKDResponseDictionary.swift b/Sources/SourceKitD/SKDResponseDictionary.swift index efb5d7612..e8b8d2507 100644 --- a/Sources/SourceKitD/SKDResponseDictionary.swift +++ b/Sources/SourceKitD/SKDResponseDictionary.swift @@ -18,6 +18,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT +#elseif canImport(Android) +import Android #endif public final class SKDResponseDictionary: Sendable { From 3f00eba475f330b448160b251df475376f35038e Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Mon, 8 Jul 2024 19:08:07 +0530 Subject: [PATCH 2/2] Import new Bionic module from Android overlay instead where possible --- Sources/SourceKitD/SKDRequestArray.swift | 4 ++-- Sources/SourceKitD/SKDRequestDictionary.swift | 4 ++-- Sources/SourceKitD/SKDResponse.swift | 4 ++-- Sources/SourceKitD/SKDResponseArray.swift | 4 ++-- Sources/SourceKitD/SKDResponseDictionary.swift | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Sources/SourceKitD/SKDRequestArray.swift b/Sources/SourceKitD/SKDRequestArray.swift index f8aed9d72..e91a6fd77 100644 --- a/Sources/SourceKitD/SKDRequestArray.swift +++ b/Sources/SourceKitD/SKDRequestArray.swift @@ -18,8 +18,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #endif extension SourceKitD { diff --git a/Sources/SourceKitD/SKDRequestDictionary.swift b/Sources/SourceKitD/SKDRequestDictionary.swift index 7ff965bc5..9b56cacf8 100644 --- a/Sources/SourceKitD/SKDRequestDictionary.swift +++ b/Sources/SourceKitD/SKDRequestDictionary.swift @@ -19,8 +19,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #endif /// Values that can be stored in a `SKDRequestDictionary`. diff --git a/Sources/SourceKitD/SKDResponse.swift b/Sources/SourceKitD/SKDResponse.swift index a48af403f..3c5511608 100644 --- a/Sources/SourceKitD/SKDResponse.swift +++ b/Sources/SourceKitD/SKDResponse.swift @@ -19,8 +19,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #endif public final class SKDResponse: Sendable { diff --git a/Sources/SourceKitD/SKDResponseArray.swift b/Sources/SourceKitD/SKDResponseArray.swift index 79c32ee50..309a735a0 100644 --- a/Sources/SourceKitD/SKDResponseArray.swift +++ b/Sources/SourceKitD/SKDResponseArray.swift @@ -18,8 +18,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #endif public final class SKDResponseArray: Sendable { diff --git a/Sources/SourceKitD/SKDResponseDictionary.swift b/Sources/SourceKitD/SKDResponseDictionary.swift index e8b8d2507..dc7a4562f 100644 --- a/Sources/SourceKitD/SKDResponseDictionary.swift +++ b/Sources/SourceKitD/SKDResponseDictionary.swift @@ -18,8 +18,8 @@ import Glibc import Musl #elseif canImport(CRT) import CRT -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #endif public final class SKDResponseDictionary: Sendable {