diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-18 08:34:44 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-18 08:34:44 -0300 |
| commit | eab8d714e048bd93b34c768044e2b7282151d703 (patch) | |
| tree | e937fe0457d279314cffdb6c0b6fa6d139082b9b | |
| parent | a9f2468ed77b28b1364f412ece50a51eb334d4bd (diff) | |
| parent | 1b163c1385cc3bf696c8f9255a7d0eeca0499a65 (diff) | |
| download | mullvadvpn-eab8d714e048bd93b34c768044e2b7282151d703.tar.xz mullvadvpn-eab8d714e048bd93b34c768044e2b7282151d703.zip | |
Merge branch 'update-android-build-in-travis'
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | README.md | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 972c4774b0..4c04fe28d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,19 +34,19 @@ 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-28 --arch=arm64 --install-dir=/opt/android/toolchains/android28-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-android28-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/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: @@ -93,15 +93,15 @@ unzip sdk-tools-linux-4333796.zip wget https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip unzip android-ndk-r20-linux-x86_64.zip ./android-ndk-r20/build/tools/make-standalone-toolchain.sh \ - --platform=android-28 \ + --platform=android-21 \ --arch=arm64 \ - --install-dir=$PWD/toolchains/android28-aarch64 + --install-dir=$PWD/toolchains/android21-aarch64 ``` Set up the required environment variables: ``` -export AR_aarch64_linux_android="$PWD/toolchains/android28-aarch64/bin/aarch64-linux-android-ar" -export CC_aarch64_linux_android="$PWD/toolchains/android28-aarch64/bin/aarch64-linux-android28-clang" +export AR_aarch64_linux_android="$PWD/toolchains/android21-aarch64/bin/aarch64-linux-android-ar" +export CC_aarch64_linux_android="$PWD/toolchains/android21-aarch64/bin/aarch64-linux-android21-clang" export ANDROID_HOME="$PWD" ``` |