Merge branch 'fix/mullvad-api-build-errors'

3 files changed, 40 insertions, 10 deletions

diff --git a/mullvad-api/build.rs b/mullvad-api/build.rs
index cddf6e079d..ecb1080a0d 100644
--- a/mullvad-api/build.rs
+++ b/mullvad-api/build.rs
@@ -1,12 +1,15 @@
 fn main() {
     let crate_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
 
-    if std::env::var("TARGET").unwrap() == "aarch64-apple-ios" {
-        cbindgen::Builder::new()
-            .with_crate(crate_dir)
-            .with_language(cbindgen::Language::C)
-            .generate()
-            .expect("failed to generate bindings")
-            .write_to_file("include/mullvad-api.h");
+    match std::env::var("TARGET").unwrap().as_str() {
+        "aarch64-apple-ios" | "aarch64-apple-ios-sim" => {
+            cbindgen::Builder::new()
+                .with_crate(crate_dir)
+                .with_language(cbindgen::Language::C)
+                .generate()
+                .expect("failed to generate bindings")
+                .write_to_file("include/mullvad-api.h");
+        }
+        _ => (),
     }
 }
diff --git a/mullvad-api/src/lib.rs b/mullvad-api/src/lib.rs
index 80031bc13a..26d6b9758c 100644
--- a/mullvad-api/src/lib.rs
+++ b/mullvad-api/src/lib.rs
@@ -311,14 +311,12 @@ impl Runtime {
         )
     }
 
-    // TODO: gate for ios only
+    #[cfg(target_os = "ios")]
     pub fn with_static_addr(handle: tokio::runtime::Handle, address: SocketAddr) -> Self {
         Runtime {
             handle,
             address_cache: AddressCache::with_static_addr(address),
             api_availability: ApiAvailability::new(availability::State::default()),
-            #[cfg(target_os = "android")]
-            socket_bypass_tx,
         }
     }
 
diff --git a/test/Cargo.lock b/test/Cargo.lock
index 13b4ebcc19..41fc286059 100644
--- a/test/Cargo.lock
+++ b/test/Cargo.lock
@@ -337,6 +337,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
+name = "cbindgen"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d"
+dependencies = [
+ "heck",
+ "indexmap 1.9.3",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 1.0.109",
+ "tempfile",
+ "toml",
+]
+
+[[package]]
 name = "cc"
 version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1698,6 +1716,7 @@ dependencies = [
 name = "mullvad-api"
 version = "0.0.0"
 dependencies = [
+ "cbindgen",
  "chrono",
  "err-derive",
  "futures",
@@ -1718,6 +1737,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-socks",
+ "uuid",
 ]
 
 [[package]]
@@ -3423,6 +3443,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
 name = "tonic"
 version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"