Renamed CAndroidNDK target

colemancda · colemancda · commit 0dd867125e79 · 2026-02-27T21:31:59.000-05:00
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
 
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.
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.
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 {
diff --git a/Sources/AndroidLooper/LooperPrepareOptions.swift b/Sources/AndroidLooper/LooperPrepareOptions.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 public extension Looper {
diff --git a/Sources/AndroidLooper/SerialExecutor.swift b/Sources/AndroidLooper/SerialExecutor.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 
 import CoreFoundation
diff --git a/Sources/AndroidManifest/PermissionCheck.swift b/Sources/AndroidManifest/PermissionCheck.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #elseif canImport(Darwin)
 import Darwin
 #elseif canImport(Glibc)
diff --git a/Sources/AndroidNativeActivity/NativeActivity.swift b/Sources/AndroidNativeActivity/NativeActivity.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import AndroidLooper
 import AndroidFileManager
diff --git a/Sources/AndroidOS/AndroidAPI.swift b/Sources/AndroidOS/AndroidAPI.swift
@@ -7,7 +7,7 @@
 
 #if os(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import SwiftJava
 
@@ -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()
@@ -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
diff --git a/Sources/AndroidOS/IBinderNDK.swift b/Sources/AndroidOS/IBinderNDK.swift
@@ -8,7 +8,7 @@
 #if canImport(AndroidBinder)
 #if canImport(Android)
 import Android
-import AndroidNDK
+import CAndroidNDK
 #endif
 import SwiftJava
 import CSwiftJavaJNI
diff --git a/Sources/AndroidOS/ParcelNDK.swift b/Sources/AndroidOS/ParcelNDK.swift
diff --git a/Sources/CAndroidNDK/AndroidSupport.cpp b/Sources/CAndroidNDK/AndroidSupport.cpp
diff --git a/Sources/CAndroidNDK/include/ndk.h b/Sources/CAndroidNDK/include/ndk.h
diff --git a/Sources/CAndroidNDK/module.modulemap b/Sources/CAndroidNDK/module.modulemap
