PureSwift · colemancda · Feb 28, 2026 · Feb 28, 2026 · Feb 28, 2026 · Feb 27, 2026
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ['6.2.3']
-        arch: ['aarch64', 'x86_64']
+        swift: ['6.2.3', 'nightly-6.3']
+        arch: ['aarch64', 'x86_64', 'armv7']
         sdk: ['28', '29', '31', '33']
     runs-on: macos-15
     timeout-minutes: 30
@@ -18,4 +18,4 @@ jobs:
         run: |
           brew install skiptools/skip/skip || (brew update && brew install skiptools/skip/skip)
           skip android sdk install --version ${{ matrix.swift }}
-          ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION=${{ matrix.sdk }} skip android build --arch ${{ matrix.arch }} --android-api-level ${{ matrix.sdk }}
+          ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION=${{ matrix.sdk }} skip android build --arch ${{ matrix.arch }} --android-api-level ${{ matrix.sdk }}
diff --git a/Package.swift b/Package.swift
@@ -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"]
@@ -143,7 +143,7 @@ var package = Package(
                     name: "JavaLangReflect",
                     package: "swift-java"
                 ),
-                "AndroidNDK",
+                "CAndroidNDK",
                 "AndroidJava",
                 "AndroidManifest",
                 "AndroidR",
@@ -265,7 +265,7 @@ var package = Package(
             name: "AndroidOS",
             dependencies: [
                 "AndroidJava",
-                "AndroidNDK"
+                "CAndroidNDK"
             ],
             exclude: ["swift-java.config"],
             swiftSettings: [
@@ -293,7 +293,7 @@ var package = Package(
                 "AndroidJava",
                 "AndroidUtil",
                 "AndroidOS",
-                "AndroidNDK",
+                "CAndroidNDK",
                 "AndroidFileManager",
             ],
             exclude: ["swift-java.config"],
@@ -434,7 +434,7 @@ var package = Package(
                     name: "Socket",
                     package: "Socket"
                 ),
-                "AndroidNDK"
+                "CAndroidNDK"
             ],
             swiftSettings: [
               .swiftLanguageMode(.v6),
@@ -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)
@@ -458,7 +458,7 @@ var package = Package(
         .target(
             name: "AndroidHardware",
             dependencies: [
-                "AndroidNDK",
+                "CAndroidNDK",
                 "AndroidLooper"
             ],
             swiftSettings: [
@@ -473,7 +473,7 @@ var package = Package(
         .target(
             name: "AndroidFileManager",
             dependencies: [
-                "AndroidNDK"
+                "CAndroidNDK"
             ],
             swiftSettings: [
               .swiftLanguageMode(.v6),
@@ -487,7 +487,7 @@ var package = Package(
         .target(
             name: "AndroidManifest",
             dependencies: [
-                "AndroidNDK"
+                "CAndroidNDK"
             ],
             swiftSettings: [
               .swiftLanguageMode(.v6),
@@ -501,7 +501,7 @@ var package = Package(
         .target(
             name: "AndroidNativeActivity",
             dependencies: [
-                "AndroidNDK",
+                "CAndroidNDK",
                 "AndroidLooper",
                 "AndroidFileManager",
                 "AndroidInput",
@@ -522,7 +522,7 @@ var package = Package(
         .target(
             name: "AndroidInput",
             dependencies: [
-                "AndroidNDK",
+                "CAndroidNDK",
                 "AndroidLooper"
             ],
             swiftSettings: [
@@ -551,7 +551,7 @@ if ndkBinder {
                 name: "Binder",
                 package: "Binder"
             ),
-            "AndroidNDK"
+            "CAndroidNDK"
         ],
         swiftSettings: [
           .swiftLanguageMode(.v6)

diff --git a/Sources/AndroidBinder/AndroidBinder.swift b/Sources/AndroidBinder/AndroidBinder.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #elseif canImport(Darwin)
 import Darwin
 #elseif canImport(Glibc)

diff --git a/Sources/AndroidBinder/BinderClass.swift b/Sources/AndroidBinder/BinderClass.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 public struct BinderClass: ~Copyable {

diff --git a/Sources/AndroidBinder/Error.swift b/Sources/AndroidBinder/Error.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// Android NDK Binder Error

diff --git a/Sources/AndroidBinder/Parcel.swift b/Sources/AndroidBinder/Parcel.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import Binder
 
@@ -132,6 +132,7 @@ public extension Parcel {
      * \param length number of bytes to marshal, or nil to marshal from \p start to end.
      * \return the marshaled bytes.
      */
+    @available(Android 33, *)
     func marshal(start: Int = 0, length: Int? = nil) throws(AndroidBinderError) -> [UInt8] {
         let len = length ?? (dataSize - start)
         var buffer = [UInt8](repeating: 0, count: len)
@@ -148,6 +149,7 @@ public extension Parcel {
      *
      * \param data the bytes to unmarshal.
      */
+    @available(Android 33, *)
     func unmarshal(_ data: [UInt8]) throws(AndroidBinderError) {
         if let base = data.withUnsafeBufferPointer({ $0.baseAddress }) {
             try handle.unmarshal(base, length: data.count).get()
@@ -671,6 +673,7 @@ internal extension Parcel.Handle {
      *
      * Available since API level 33.
      */
+    @available(Android 33, *)
     func marshal(into buffer: UnsafeMutablePointer<UInt8>, start: Int, length: Int) -> Result<Void, AndroidBinderError> {
         AParcel_marshal(pointer, buffer, start, length).mapError()
     }
@@ -680,6 +683,7 @@ internal extension Parcel.Handle {
      *
      * Available since API level 33.
      */
+    @available(Android 33, *)
     func unmarshal(_ data: UnsafePointer<UInt8>, length: Int) -> Result<Void, AndroidBinderError> {
         AParcel_unmarshal(pointer, data, length).mapError()
     }

diff --git a/Sources/AndroidBinder/Status.swift b/Sources/AndroidBinder/Status.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /**

diff --git a/Sources/AndroidContent/AssetManagerNDK.swift b/Sources/AndroidContent/AssetManagerNDK.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import SwiftJava
 import CSwiftJavaJNI

diff --git a/Sources/AndroidFileManager/AndroidFileManager.swift b/Sources/AndroidFileManager/AndroidFileManager.swift
@@ -7,6 +7,6 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
diff --git a/Sources/AndroidFileManager/Asset.swift b/Sources/AndroidFileManager/Asset.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// A handle to an `AAsset`.

diff --git a/Sources/AndroidFileManager/AssetManager.swift b/Sources/AndroidFileManager/AssetManager.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// Wrapper around Android `AAssetManager`.

diff --git a/Sources/AndroidFileManager/Configuration.swift b/Sources/AndroidFileManager/Configuration.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// Wrapper around Android NDK `AConfiguration`.

diff --git a/Sources/AndroidFileManager/StorageManager.swift b/Sources/AndroidFileManager/StorageManager.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// Wrapper around Android `AStorageManager`.

diff --git a/Sources/AndroidHardware/Sensor.swift b/Sources/AndroidHardware/Sensor.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// A reference to a hardware sensor.
@@ -82,6 +82,7 @@ public extension Sensor {
     }
 
     /// The hardware sensor handle, unique within a device.
+    @available(Android 29, *)
     var handle: Int32 {
         ASensor_getHandle(pointer)
     }

diff --git a/Sources/AndroidHardware/SensorEvent.swift b/Sources/AndroidHardware/SensorEvent.swift
@@ -7,7 +7,7 @@
 
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// A sensor event containing a measurement from a hardware sensor.

diff --git a/Sources/AndroidHardware/SensorEventQueue.swift b/Sources/AndroidHardware/SensorEventQueue.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// An event queue for receiving sensor events.

diff --git a/Sources/AndroidHardware/SensorManager.swift b/Sources/AndroidHardware/SensorManager.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import AndroidLooper
 

diff --git a/Sources/AndroidInput/GameController.swift b/Sources/AndroidInput/GameController.swift
@@ -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.

diff --git a/Sources/AndroidInput/InputEvent.swift b/Sources/AndroidInput/InputEvent.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// Input Event

diff --git a/Sources/AndroidInput/InputQueue.swift b/Sources/AndroidInput/InputQueue.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import AndroidLooper
 

diff --git a/Sources/AndroidInput/Keycodes.swift b/Sources/AndroidInput/Keycodes.swift
@@ -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.
@@ -748,13 +748,7 @@ public extension KeyCode {
 
     /// Recent Apps key.
     static var recentApps: KeyCode { KeyCode(rawValue: AKEYCODE_RECENT_APPS) }
-
-    /// Screenshot key.
-    static var screenshot: KeyCode { KeyCode(rawValue: AKEYCODE_SCREENSHOT) }
-
-    /// Emoji Picker key.
-    static var emojiPicker: KeyCode { KeyCode(rawValue: AKEYCODE_EMOJI_PICKER) }
-
+
     // MARK: System Navigation Gestures
 
     /// System Navigation Up key.

diff --git a/Sources/AndroidKit/AndroidKit.swift b/Sources/AndroidKit/AndroidKit.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 @_exported import SwiftJava
 @_exported import JavaIO

diff --git a/Sources/AndroidLooper/AndroidMainActor.swift b/Sources/AndroidLooper/AndroidMainActor.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 import SystemPackage

diff --git a/Sources/AndroidLooper/Choreographer.swift b/Sources/AndroidLooper/Choreographer.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 /// Choreographer coordinates the timing of frame rendering.

diff --git a/Sources/AndroidLooper/Looper.swift b/Sources/AndroidLooper/Looper.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import SystemPackage
 

diff --git a/Sources/AndroidLooper/LooperEvents.swift b/Sources/AndroidLooper/LooperEvents.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 public extension Looper {