diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-04-10 10:01:38 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-04-10 10:01:38 -0300 |
| commit | 8b2d13d07a974dad22b35954426f47b93be9253e (patch) | |
| tree | d185ebf93be2254bf3f0ce9b283481fda4d4c3e2 | |
| parent | d5e9fda6765052caa0197759a22b5913c4e1ba99 (diff) | |
| parent | c15d04fce1b4fc1cd0c424a1f69ca24f9d6b7327 (diff) | |
| download | mullvadvpn-8b2d13d07a974dad22b35954426f47b93be9253e.tar.xz mullvadvpn-8b2d13d07a974dad22b35954426f47b93be9253e.zip | |
Merge branch 'android-travis-ci'
| -rw-r--r-- | .travis.yml | 28 | ||||
| m--------- | dist-assets/binaries | 0 | ||||
| -rw-r--r-- | talpid-core/src/offline/dummy.rs | 3 | ||||
| -rw-r--r-- | talpid-core/src/routing/android.rs | 12 |
4 files changed, 33 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 394a26ee1d..ffbc40a454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,34 @@ matrix: before_script: *rust_before_script script: *rust_script + # Android + - language: android + sudo: true + android: + components: + - android-28 + - build-tools-28.0.3 + install: + - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y + - source $HOME/.cargo/env + - rustup target add aarch64-linux-android + - curl -sf -L -o /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-r19b-linux-x86_64.zip + - sudo mkdir /opt/android + - sudo unzip -q -d /opt/android/ /tmp/ndk.zip + - sudo /opt/android/android-ndk-r19b/build/tools/make-standalone-toolchain.sh --platform=android-28 --arch=arm64 --install-dir=/opt/android/toolchains/android28-aarch64 + - | + cat >> $HOME/.cargo/config << EOF + [target.aarch64-linux-android] + ar = "/opt/android/android-ndk-r19b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" + linker = "/opt/android/android-ndk-r19b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang" + script: + - export AR_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android-ar + - export CC_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android28-clang + - source env.sh android + - cargo build --target aarch64-linux-android --verbose + - cd android + - ./gradlew --console plain assembleDebug + notifications: email: diff --git a/dist-assets/binaries b/dist-assets/binaries -Subproject 3dadc6363bf142cd4a0772b9fa0514840ae1844 +Subproject 4b0ad1d6cc92d7f327443e7698b90df0152f4b8 diff --git a/talpid-core/src/offline/dummy.rs b/talpid-core/src/offline/dummy.rs index 7e7b215c72..d3d39b3fa8 100644 --- a/talpid-core/src/offline/dummy.rs +++ b/talpid-core/src/offline/dummy.rs @@ -2,7 +2,8 @@ use crate::tunnel_state_machine::TunnelCommand; use futures::sync::mpsc::UnboundedSender; #[derive(err_derive::Error, Debug)] -pub struct Error(()); +#[error(display = "Dummy offline check error")] +pub struct Error; pub struct MonitorHandle; diff --git a/talpid-core/src/routing/android.rs b/talpid-core/src/routing/android.rs index 5c562537f1..7c3ba70230 100644 --- a/talpid-core/src/routing/android.rs +++ b/talpid-core/src/routing/android.rs @@ -1,11 +1,5 @@ -use super::{ - subprocess::{Exec, RunExpr}, - NetNode, RequiredRoutes, -}; -use std::{ - collections::HashSet, - net::{IpAddr, Ipv4Addr}, -}; +use super::RequiredRoutes; +use std::net::{IpAddr, Ipv4Addr}; /// Stub error type for routing errors on Android. #[derive(Debug, err_derive::Error)] @@ -17,7 +11,7 @@ pub struct RouteManager; impl super::RoutingT for RouteManager { type Error = Error; - fn new() -> Result<Self> { + fn new() -> Result<Self, Self::Error> { Ok(RouteManager) } |