✨ feat: Update jni version for Android

caoccao · Sep 2, 2024 · f27958c · f27958c
1 parent 96bede1
commit f27958c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -17,7 +17,11 @@
 
 use anyhow::Result;
 use jni::objects::{JClass, JObject, JString};
-use jni::sys::{jint, jobject, jstring, JNI_VERSION_1_8};
+#[cfg(target_os = "android")]
+use jni::sys::JNI_VERSION_1_6;
+#[cfg(not(target_os = "android"))]
+use jni::sys::JNI_VERSION_1_8;
+use jni::sys::{jint, jobject, jstring};
 use jni::{JNIEnv, JavaVM};
 use jni_utils::FromJava;
 
@@ -52,7 +56,11 @@ pub extern "system" fn JNI_OnLoad<'local>(java_vm: JavaVM, _: c_void) -> jint {
   plugin_utils::init(&mut env);
   span_utils::init(&mut env);
   token_utils::init(&mut env);
-  JNI_VERSION_1_8
+  #[cfg(target_os = "android")]
+  let jni_version = JNI_VERSION_1_6;
+  #[cfg(not(target_os = "android"))]
+  let jni_version = JNI_VERSION_1_8;
+  jni_version
 }
 
 #[no_mangle]