Fix Android build.

sharjeel · Feb 24, 2021 · e2b6960 · e2b6960
1 parent 83b148c
commit e2b6960
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/jni.rs b/src/jni.rs
@@ -7,7 +7,7 @@ use std::ptr;
 
 use jni::objects::{JByteBuffer, JClass, JString};
 use jni::strings::JNIStr;
-use jni::sys::{jbyteArray, jint, jlong, jstring};
+use jni::sys::{jbyteArray, jint, jlong, jshort, jstring};
 use jni::JNIEnv;
 
 use crate::crypto::x25519::X25519SecretKey;
@@ -132,6 +132,8 @@ pub unsafe extern "C" fn create_new_tunnel(
     _class: JClass,
     arg_secret_key: JString,
     arg_public_key: JString,
+    keep_alive: jshort,
+    index: jint,
 ) -> jlong {
     let secret_key = match env.get_string_utf_chars(arg_secret_key) {
         Ok(v) => v,
@@ -143,7 +145,14 @@ pub unsafe extern "C" fn create_new_tunnel(
         Err(_) => return 0,
     };
 
-    let tunnel = new_tunnel(secret_key, public_key, Some(log_print), 3);
+    let tunnel = new_tunnel(
+        secret_key,
+        public_key,
+        keep_alive as u16,
+        index as u32,
+        Some(log_print),
+        3,
+    );
 
     if tunnel.is_null() {
         return 0;

diff --git a/src/lib.rs b/src/lib.rs
@@ -7,7 +7,7 @@
 
 pub mod crypto;
 
-#[cfg(not(target_os = "windows"))]
+#[cfg(not(any(target_os = "windows", target_os = "android")))]
 pub mod device;
 
 pub mod ffi;

diff --git a/src/noise/tests/mod.rs b/src/noise/tests/mod.rs
@@ -37,7 +37,10 @@ mod tests {
     impl SpinLock {
         pub fn lock(&self) {
             loop {
-                if self.lock.compare_and_swap(true, false, Ordering::Relaxed) {
+                if let Ok(true) =
+                    self.lock
+                        .compare_exchange(true, false, Ordering::SeqCst, Ordering::SeqCst)
+                {
                     break;
                 }
             }