Skip to content

Commit 5be2c24

Browse files
marcpruxmarcprux
committed
Replace Bionic imports with Android and various other fixes
1 parent 45c4fdb commit 5be2c24

File tree

15 files changed

+46
-40
lines changed

15 files changed

+46
-40
lines changed

‎Samples/SwiftAndJavaJarSampleLib/Sources/MySwiftLibrary/MySwiftLibrary.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#if os(Linux)
2121
import Glibc
22+
#elseif os(Android)
23+
import Android
2224
#else
2325
import Darwin.C
2426
#endif

‎Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/MySwiftLibrary.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#if os(Linux)
2121
import Glibc
22+
#elseif os(Android)
23+
import Android
2224
#else
2325
import Darwin.C
2426
#endif

‎Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftLibrary.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#if os(Linux)
2121
import Glibc
22+
#elseif os(Android)
23+
import Android
2224
#else
2325
import Darwin.C
2426
#endif

‎Sources/ExampleSwiftLibrary/MySwiftLibrary.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#if os(Linux)
2121
import Glibc
22+
#elseif os(Android)
23+
import Android
2224
#elseif os(Windows)
2325
import CRT
2426
#elseif canImport(Darwin)

‎Sources/SwiftJava/JavaEnvironment.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
//===----------------------------------------------------------------------===//
1414

1515

16-
#if canImport(Android)
17-
typealias JNINativeInterface_ = JNINativeInterface
18-
#endif
19-
2016
extension UnsafeMutablePointer<JNIEnv?> {
2117
public var interface: JNINativeInterface_ { self.pointee!.pointee }
2218
}

‎Sources/SwiftJava/JavaKitVM/LockedState.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import os
1717
#if FOUNDATION_FRAMEWORK && canImport(C.os.lock)
1818
import C.os.lock
1919
#endif
20-
#elseif canImport(Bionic)
21-
import Bionic
20+
#elseif canImport(Android)
21+
import Android
2222
#elseif canImport(Glibc)
2323
import Glibc
2424
#elseif canImport(Musl)
@@ -33,7 +33,7 @@ package struct LockedState<State> {
3333
private struct _Lock {
3434
#if canImport(os)
3535
typealias Primitive = os_unfair_lock
36-
#elseif canImport(Bionic) || canImport(Glibc) || canImport(Musl)
36+
#elseif canImport(Android) || canImport(Glibc) || canImport(Musl)
3737
typealias Primitive = pthread_mutex_t
3838
#elseif canImport(WinSDK)
3939
typealias Primitive = SRWLOCK
@@ -48,7 +48,7 @@ package struct LockedState<State> {
4848
fileprivate static func initialize(_ platformLock: PlatformLock) {
4949
#if canImport(os)
5050
platformLock.initialize(to: os_unfair_lock())
51-
#elseif canImport(Bionic) || canImport(Glibc)
51+
#elseif canImport(Android) || canImport(Glibc)
5252
pthread_mutex_init(platformLock, nil)
5353
#elseif canImport(WinSDK)
5454
InitializeSRWLock(platformLock)
@@ -58,7 +58,7 @@ package struct LockedState<State> {
5858
}
5959

6060
fileprivate static func deinitialize(_ platformLock: PlatformLock) {
61-
#if canImport(Bionic) || canImport(Glibc)
61+
#if canImport(Android) || canImport(Glibc)
6262
pthread_mutex_destroy(platformLock)
6363
#endif
6464
platformLock.deinitialize(count: 1)
@@ -67,7 +67,7 @@ package struct LockedState<State> {
6767
static fileprivate func lock(_ platformLock: PlatformLock) {
6868
#if canImport(os)
6969
os_unfair_lock_lock(platformLock)
70-
#elseif canImport(Bionic) || canImport(Glibc)
70+
#elseif canImport(Android) || canImport(Glibc)
7171
pthread_mutex_lock(platformLock)
7272
#elseif canImport(WinSDK)
7373
AcquireSRWLockExclusive(platformLock)
@@ -79,7 +79,7 @@ package struct LockedState<State> {
7979
static fileprivate func unlock(_ platformLock: PlatformLock) {
8080
#if canImport(os)
8181
os_unfair_lock_unlock(platformLock)
82-
#elseif canImport(Bionic) || canImport(Glibc)
82+
#elseif canImport(Android) || canImport(Glibc)
8383
pthread_mutex_unlock(platformLock)
8484
#elseif canImport(WinSDK)
8585
ReleaseSRWLockExclusive(platformLock)

‎Sources/SwiftJava/JavaKitVM/ThreadLocalStorage.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#if canImport(Darwin)
1616
import Darwin
17-
#elseif canImport(Bionic)
18-
import Bionic
17+
#elseif canImport(Android)
18+
import Android
1919
#elseif canImport(Glibc)
2020
import Glibc
2121
#elseif canImport(Musl)
@@ -24,12 +24,12 @@ import Musl
2424
import WinSDK
2525
#endif
2626

27-
#if !(canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl) || canImport(WinSDK))
27+
#if !(canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl) || canImport(WinSDK))
2828
private var _globalTlsValue: UnsafeMutableRawPointer?
2929
#endif
3030

3131
package struct ThreadLocalStorage: ~Copyable {
32-
#if canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl)
32+
#if canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl)
3333
private typealias PlatformKey = pthread_key_t
3434
#elseif canImport(WinSDK)
3535
private typealias PlatformKey = DWORD
@@ -45,14 +45,14 @@ package struct ThreadLocalStorage: ~Copyable {
4545

4646
package typealias OnThreadExit = @convention(c) (_: Value) -> ()
4747

48-
#if canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl)
48+
#if canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl)
4949
private var _key: PlatformKey
5050
#elseif canImport(WinSDK)
5151
private let _key: PlatformKey
5252
#endif
5353

5454
package init(onThreadExit: OnThreadExit) {
55-
#if canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl)
55+
#if canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl)
5656
_key = 0
5757
pthread_key_create(&_key, onThreadExit)
5858
#elseif canImport(WinSDK)
@@ -61,7 +61,7 @@ package struct ThreadLocalStorage: ~Copyable {
6161
}
6262

6363
package func get() -> UnsafeMutableRawPointer? {
64-
#if canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl)
64+
#if canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl)
6565
pthread_getspecific(_key)
6666
#elseif canImport(WinSDK)
6767
FlsGetValue(_key)
@@ -71,7 +71,7 @@ package struct ThreadLocalStorage: ~Copyable {
7171
}
7272

7373
package func set(_ value: Value) {
74-
#if canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl)
74+
#if canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl)
7575
pthread_setspecific(_key, value)
7676
#elseif canImport(WinSDK)
7777
FlsSetValue(_key, value)
@@ -81,7 +81,7 @@ package struct ThreadLocalStorage: ~Copyable {
8181
}
8282

8383
deinit {
84-
#if canImport(Darwin) || canImport(Bionic) || canImport(Glibc) || canImport(Musl)
84+
#if canImport(Darwin) || canImport(Android) || canImport(Glibc) || canImport(Musl)
8585
pthread_key_delete(_key)
8686
#elseif canImport(WinSDK)
8787
FlsFree(_key)

‎Sources/_Subprocess/Configuration.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import System
1717

1818
#if canImport(Darwin)
1919
import Darwin
20-
#elseif canImport(Bionic)
21-
import Bionic
20+
#elseif canImport(Android)
21+
import Android
2222
#elseif canImport(Glibc)
2323
import Glibc
2424
#elseif canImport(Musl)

‎Sources/_Subprocess/Error.swift‎

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

1212
#if canImport(Darwin)
1313
import Darwin
14-
#elseif canImport(Bionic)
15-
import Bionic
14+
#elseif canImport(Android)
15+
import Android
1616
#elseif canImport(Glibc)
1717
import Glibc
1818
#elseif canImport(Musl)

‎Sources/_Subprocess/Execution.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import System
1717

1818
#if canImport(Darwin)
1919
import Darwin
20-
#elseif canImport(Bionic)
21-
import Bionic
20+
#elseif canImport(Android)
21+
import Android
2222
#elseif canImport(Glibc)
2323
import Glibc
2424
#elseif canImport(Musl)

0 commit comments

Comments
 (0)