diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-17 19:29:04 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-18 10:53:44 +0000 |
| commit | 854f154fe9c44bc1550934f6b8c70760bb69ee9d (patch) | |
| tree | 348ef839a0dade14f75525f264b722cf47a84848 | |
| parent | a9f2468ed77b28b1364f412ece50a51eb334d4bd (diff) | |
| download | mullvadvpn-854f154fe9c44bc1550934f6b8c70760bb69ee9d.tar.xz mullvadvpn-854f154fe9c44bc1550934f6b8c70760bb69ee9d.zip | |
Change toolchain API 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 972c4774b0..d0c3dbd7d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,16 +37,16 @@ matrix: - 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 + - sudo /opt/android/android-ndk-r19b/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-android28-clang" + linker = "/opt/android/android-ndk-r19b/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/android28-aarch64/bin/aarch64-linux-android-ar - - export CC_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android28-clang + - export AR_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android-ar + - export CC_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android21-clang - source env.sh aarch64-linux-android - env script: |