Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ var package = Package(
name: "AndroidLooper", targets: ["AndroidLooper"]
),
.library(
name: "AndroidNDK", targets: ["AndroidNDK"]
name: "CAndroidNDK", targets: ["CAndroidNDK"]
),
.library(
name: "AndroidHardware", targets: ["AndroidHardware"]
Expand Down Expand Up @@ -143,7 +143,7 @@ var package = Package(
name: "JavaLangReflect",
package: "swift-java"
),
"AndroidNDK",
"CAndroidNDK",
"AndroidJava",
"AndroidManifest",
"AndroidR",
Expand Down Expand Up @@ -265,7 +265,7 @@ var package = Package(
name: "AndroidOS",
dependencies: [
"AndroidJava",
"AndroidNDK"
"CAndroidNDK"
],
exclude: ["swift-java.config"],
swiftSettings: [
Expand Down Expand Up @@ -293,7 +293,7 @@ var package = Package(
"AndroidJava",
"AndroidUtil",
"AndroidOS",
"AndroidNDK",
"CAndroidNDK",
"AndroidFileManager",
],
exclude: ["swift-java.config"],
Expand Down Expand Up @@ -434,7 +434,7 @@ var package = Package(
name: "Socket",
package: "Socket"
),
"AndroidNDK"
"CAndroidNDK"
],
swiftSettings: [
.swiftLanguageMode(.v6),
Expand All @@ -446,7 +446,7 @@ var package = Package(
]
),
.target(
name: "AndroidNDK",
name: "CAndroidNDK",
cxxSettings: [
.define("ANDROID_NDK_VERSION", to: ndkVersion.description),
.define("ANDROID_SDK_VERSION", to: sdkVersion.description)
Expand All @@ -458,7 +458,7 @@ var package = Package(
.target(
name: "AndroidHardware",
dependencies: [
"AndroidNDK",
"CAndroidNDK",
"AndroidLooper"
],
swiftSettings: [
Expand All @@ -473,7 +473,7 @@ var package = Package(
.target(
name: "AndroidFileManager",
dependencies: [
"AndroidNDK"
"CAndroidNDK"
],
swiftSettings: [
.swiftLanguageMode(.v6),
Expand All @@ -487,7 +487,7 @@ var package = Package(
.target(
name: "AndroidManifest",
dependencies: [
"AndroidNDK"
"CAndroidNDK"
],
swiftSettings: [
.swiftLanguageMode(.v6),
Expand All @@ -501,7 +501,7 @@ var package = Package(
.target(
name: "AndroidNativeActivity",
dependencies: [
"AndroidNDK",
"CAndroidNDK",
"AndroidLooper",
"AndroidFileManager",
"AndroidInput",
Expand All @@ -522,7 +522,7 @@ var package = Package(
.target(
name: "AndroidInput",
dependencies: [
"AndroidNDK",
"CAndroidNDK",
"AndroidLooper"
],
swiftSettings: [
Expand Down Expand Up @@ -551,7 +551,7 @@ if ndkBinder {
name: "Binder",
package: "Binder"
),
"AndroidNDK"
"CAndroidNDK"
],
swiftSettings: [
.swiftLanguageMode(.v6)
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidBinder/AndroidBinder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#elseif canImport(Darwin)
import Darwin
#elseif canImport(Glibc)
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidBinder/BinderClass.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

public struct BinderClass: ~Copyable {
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidBinder/Error.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Android NDK Binder Error
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidBinder/Parcel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import Binder

Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidBinder/Status.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/**
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidContent/AssetManagerNDK.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import SwiftJava
import CSwiftJavaJNI
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidFileManager/AndroidFileManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

2 changes: 1 addition & 1 deletion Sources/AndroidFileManager/Asset.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// A handle to an `AAsset`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidFileManager/AssetManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Wrapper around Android `AAssetManager`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidFileManager/Configuration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Wrapper around Android NDK `AConfiguration`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidFileManager/StorageManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Wrapper around Android `AStorageManager`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidHardware/Sensor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// A reference to a hardware sensor.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidHardware/SensorEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// A sensor event containing a measurement from a hardware sensor.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidHardware/SensorEventQueue.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// An event queue for receiving sensor events.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidHardware/SensorManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import AndroidLooper

Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidInput/GameController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#if AGDK
#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Swift wrapper for the Android Game Controller (Paddleboat) C API.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidInput/InputEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Input Event
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidInput/InputQueue.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import AndroidLooper

Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidInput/Keycodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Key code identifying a physical key on a keyboard or virtual key from an input device.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidKit/AndroidKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
@_exported import SwiftJava
@_exported import JavaIO
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidLooper/AndroidMainActor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

import SystemPackage
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidLooper/Choreographer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

/// Choreographer coordinates the timing of frame rendering.
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidLooper/Looper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import SystemPackage

Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidLooper/LooperEvents.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

public extension Looper {
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidLooper/LooperPrepareOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

public extension Looper {
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidLooper/SerialExecutor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif

import CoreFoundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidManifest/PermissionCheck.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#elseif canImport(Darwin)
import Darwin
#elseif canImport(Glibc)
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidNativeActivity/NativeActivity.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import AndroidLooper
import AndroidFileManager
Expand Down
6 changes: 3 additions & 3 deletions Sources/AndroidOS/AndroidAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if os(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import SwiftJava

Expand Down Expand Up @@ -35,7 +35,7 @@ public extension AndroidAPI {
internal extension AndroidAPI {

static func deviceAPILevel() throws -> Int32 {
#if os(Android) && canImport(AndroidNDK)
#if os(Android) && canImport(CAndroidNDK)
try ndkValue().get()
#else
try jniValue()
Expand All @@ -58,7 +58,7 @@ internal extension AndroidAPI {

/// Available since API level 24. Returns the API level of the device we're actually running on.
static func ndkValue() -> Result<Int32, Exception> {
#if os(Android) && canImport(AndroidNDK)
#if os(Android) && canImport(CAndroidNDK)
let value = android_get_device_api_level()
#else
let value: Int32 = -1
Expand Down
2 changes: 1 addition & 1 deletion Sources/AndroidOS/IBinderNDK.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#if canImport(AndroidBinder)
#if canImport(Android)
import Android
import AndroidNDK
import CAndroidNDK
#endif
import SwiftJava
import CSwiftJavaJNI
Expand Down
Loading