JavaKit: support for Android NDK JVM

Author: lhoward

Package.swift

@@ -245,8 +245,7 @@ let package = Package(
           .when(platforms: [.windows])),
         .linkedLibrary(
           "jvm",
-          .when(platforms: [.linux, .macOS, .windows])
-        ),
+          .when(platforms: [.iOS, .macOS, .tvOS, .watchOS, .macCatalyst, .linux, .openbsd, .wasi, .windows])),
       ]
     ),
     .target(

Samples/JavaKitSampleApp/Package.swift

@@ -30,7 +30,7 @@ func findJavaHome() -> String {
 }
 let javaHome = findJavaHome()
 
-let javaIncludePath = "\(javaHome)/include"
+let javaIncludePath = ProcessInfo.processInfo.environment["JAVA_INCLUDE_PATH"] ?? "\(javaHome)/include"
 #if os(Linux)
   let javaPlatformIncludePath = "\(javaIncludePath)/linux"
 #elseif os(macOS)

Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift

@@ -27,7 +27,10 @@ extension HelloSwift: HelloSwiftNativeMethods {
     let answer = self.sayHelloBack(i + j)
     print("Swift got back \(answer) from Java")
 
+#if !canImport(Android)
+    // no class variables in Kotlin
     print("We expect the above value to be the initial value, \(self.javaClass.initialValue)")
+#endif
 
     print("Updating Java field value to something different")
     self.value = 2.71828

Sources/ExampleSwiftLibrary/MySwiftLibrary.swift

@@ -23,6 +23,8 @@ import Glibc
 import CRT
 #elseif canImport(Darwin)
 import Darwin.C
+#elseif canImport(Android)
+import Android
 #endif
 
 public func helloWorld() {

Sources/JavaKit/JavaEnvironment.swift

@@ -14,6 +14,10 @@
 
 import JavaRuntime
 
+#if canImport(Android)
+typealias JNINativeInterface_ = JNINativeInterface
+#endif
+
 extension UnsafeMutablePointer<JNIEnv?> {
   var interface: JNINativeInterface_ { self.pointee!.pointee }
 }

Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift

@@ -19,6 +19,11 @@ import Foundation
 #endif
 
 public typealias JavaVMPointer = UnsafeMutablePointer<JavaVM?>
+#if canImport(Android)
+typealias JNIEnvPointer = UnsafeMutablePointer<JNIEnv?>
+#else
+typealias JNIEnvPointer = UnsafeMutableRawPointer
+#endif
 
 public final class JavaVirtualMachine: @unchecked Sendable {
   /// The JNI version that we depend on.
@@ -61,7 +66,7 @@ public final class JavaVirtualMachine: @unchecked Sendable {
   ) throws {
     self.classpath = classpath
     var jvm: JavaVMPointer? = nil
-    var environment: UnsafeMutableRawPointer? = nil
+    var environment: JNIEnvPointer? = nil
     var vmArgs = JavaVMInitArgs()
     vmArgs.version = JavaVirtualMachine.jniVersion
     vmArgs.ignoreUnrecognized = jboolean(ignoreUnrecognized ? JNI_TRUE : JNI_FALSE)
@@ -161,12 +166,18 @@ extension JavaVirtualMachine {
       return environment.assumingMemoryBound(to: JNIEnv?.self)
     }
 
+#if canImport(Android)
+    var jniEnv = environment?.assumingMemoryBound(to: JNIEnv?.self)
+#else
+    var jniEnv = environment
+#endif
+
     // Attach the current thread to the JVM.
     let attachResult: jint
     if asDaemon {
-      attachResult = jvm.pointee!.pointee.AttachCurrentThreadAsDaemon(jvm, &environment, nil)
+      attachResult = jvm.pointee!.pointee.AttachCurrentThreadAsDaemon(jvm, &jniEnv, nil)
     } else {
-      attachResult = jvm.pointee!.pointee.AttachCurrentThread(jvm, &environment, nil)
+      attachResult = jvm.pointee!.pointee.AttachCurrentThread(jvm, &jniEnv, nil)
     }
 
     // If we failed to attach, report that.
@@ -175,9 +186,13 @@ extension JavaVirtualMachine {
       throw attachError
     }
 
-    JavaVirtualMachine.destroyTLS.set(environment!)
+    JavaVirtualMachine.destroyTLS.set(jniEnv!)
 
-    return environment!.assumingMemoryBound(to: JNIEnv?.self)
+#if canImport(Android)
+    return jniEnv!
+#else
+    return jniEnv!.assumingMemoryBound(to: JNIEnv?.self)
+#endif
   }
 
   /// Detach the current thread from the Java Virtual Machine. All Java