diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-17 19:29:51 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-18 10:53:45 +0000 |
| commit | e916afb574efed1cfb8c5069afc85a4e2196c5f0 (patch) | |
| tree | 9ed684b117ab88c9ff0866b2d5c3fbf4f90b7d6f | |
| parent | 854f154fe9c44bc1550934f6b8c70760bb69ee9d (diff) | |
| download | mullvadvpn-e916afb574efed1cfb8c5069afc85a4e2196c5f0.tar.xz mullvadvpn-e916afb574efed1cfb8c5069afc85a4e2196c5f0.zip | |
Update NDK version in Travis
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d0c3dbd7d1..4c04fe28d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,15 +34,15 @@ matrix: - 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 + - curl -sf -L -o /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-r20-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-21 --arch=arm64 --install-dir=/opt/android/toolchains/android21-aarch64 + - sudo /opt/android/android-ndk-r20/build/tools/make-standalone-toolchain.sh --platform=android-21 --arch=arm64 --install-dir=/opt/android/toolchains/android21-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-android21-clang" + ar = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" + linker = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang" before_script: - export RUSTFLAGS="--deny unused_imports --deny dead_code" - export AR_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android-ar |