diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-09-01 10:04:30 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-09-01 10:04:30 +0200 |
| commit | 00445d33a30ed538f9512af7b354d155a4063311 (patch) | |
| tree | 496f3b9358edba7b78c2663c2dfed8d73947fd9c | |
| parent | af02acf0cf059ac4eb109ba960538db77f3bfa6d (diff) | |
| parent | 033c0d42f8135581f88d5842c2c659f00e20d968 (diff) | |
| download | mullvadvpn-00445d33a30ed538f9512af7b354d155a4063311.tar.xz mullvadvpn-00445d33a30ed538f9512af7b354d155a4063311.zip | |
Merge branch 'remove-android-dep'
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 3 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 10 | ||||
| -rw-r--r-- | talpid-core/src/process/mod.rs | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index faf54cca87..86abaabfaf 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -35,8 +35,9 @@ mullvad-rpc = { path = "../mullvad-rpc" } talpid-core = { path = "../talpid-core" } talpid-types = { path = "../talpid-types" } -mullvad-management-interface = { path = "../mullvad-management-interface" } +[target.'cfg(not(target_os="android"))'.dependencies] triggered = "0.1.1" +mullvad-management-interface = { path = "../mullvad-management-interface" } [target.'cfg(target_os="android")'.dependencies] android_logger = "0.8" diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 3a1cd4aa0b..f135e52b26 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -19,7 +19,6 @@ ipnetwork = "0.16" lazy_static = "1.0" libc = "0.2" log = "0.4" -openvpn-plugin = { git = "https://github.com/mullvad/openvpn-plugin-rs", branch = "auth-failed-event", features = ["serde"] } os_pipe = "0.8" parking_lot = "0.9" regex = "1.1.0" @@ -30,13 +29,16 @@ tokio-executor = "0.1" uuid = { version = "0.7", features = ["v4"] } zeroize = "1" chrono = "0.4" -parity-tokio-ipc = "0.7" tokio02 = { package = "tokio", version = "0.2", features = [ "io-util", "process", "rt-core", "rt-threaded", "stream"] } +rand = "0.7" + + +[target.'cfg(not(target_os="android"))'.dependencies] +openvpn-plugin = { git = "https://github.com/mullvad/openvpn-plugin-rs", branch = "auth-failed-event", features = ["serde"] } +parity-tokio-ipc = "0.7" triggered = "0.1.1" tonic = "0.3.1" prost = "0.6" -rand = "0.7" - [target.'cfg(unix)'.dependencies] nix = "0.17" diff --git a/talpid-core/src/process/mod.rs b/talpid-core/src/process/mod.rs index 1613389e4f..54cdeb9042 100644 --- a/talpid-core/src/process/mod.rs +++ b/talpid-core/src/process/mod.rs @@ -1,4 +1,5 @@ /// A module for all OpenVPN related process management. +#[cfg(not(target_os = "android"))] pub mod openvpn; /// A trait for stopping subprocesses gracefully. diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index ad7563fe7c..5dc14ba8d9 100644 --- a/talpid-core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs @@ -110,7 +110,7 @@ static OPENVPN_DIE_TIMEOUT: Duration = Duration::from_secs(30); #[cfg(target_os = "macos")] const OPENVPN_PLUGIN_FILENAME: &str = "libtalpid_openvpn_plugin.dylib"; -#[cfg(any(target_os = "linux", target_os = "android"))] +#[cfg(target_os = "linux")] const OPENVPN_PLUGIN_FILENAME: &str = "libtalpid_openvpn_plugin.so"; #[cfg(windows)] const OPENVPN_PLUGIN_FILENAME: &str = "talpid_openvpn_plugin.dll"; |