diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-22 12:12:54 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-22 12:12:54 -0300 |
| commit | 2ef16af6f59762140fcc09a8701addafb6746784 (patch) | |
| tree | 19e4921bc0d4228fd355dcb3ce1e5ebf6a875267 /android | |
| parent | 934fd8ad66394a2181ca9170c7c1cc5aea417225 (diff) | |
| parent | 0a89c9ad8f2b4a2ff3823ff30ab77ff4243ee63c (diff) | |
| download | mullvadvpn-2ef16af6f59762140fcc09a8701addafb6746784.tar.xz mullvadvpn-2ef16af6f59762140fcc09a8701addafb6746784.zip | |
Merge branch 'manually-strip-android-libs'
Diffstat (limited to 'android')
| -rwxr-xr-x | android/fdroid-build/env.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/android/fdroid-build/env.sh b/android/fdroid-build/env.sh index e510116e58..f59478ee64 100755 --- a/android/fdroid-build/env.sh +++ b/android/fdroid-build/env.sh @@ -8,14 +8,14 @@ export GOROOT="$HOME/go" export PATH="$PATH:$GOROOT/bin" # Ensure Rust crates know which tools to use for cross-compilation -export TOOLCHAIN_DIR="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin" +export NDK_TOOLCHAIN_DIR="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin" -export AR_i686_linux_android="$TOOLCHAIN_DIR/i686-linux-android-ar" -export AR_x86_64_linux_android="$TOOLCHAIN_DIR/x86_64-linux-android-ar" -export AR_aarch64_linux_android="$TOOLCHAIN_DIR/aarch64-linux-android-ar" -export AR_armv7_linux_androideabi="$TOOLCHAIN_DIR/arm-linux-androideabi-ar" +export AR_i686_linux_android="$NDK_TOOLCHAIN_DIR/i686-linux-android-ar" +export AR_x86_64_linux_android="$NDK_TOOLCHAIN_DIR/x86_64-linux-android-ar" +export AR_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/aarch64-linux-android-ar" +export AR_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/arm-linux-androideabi-ar" -export CC_i686_linux_android="$TOOLCHAIN_DIR/i686-linux-android21-clang" -export CC_x86_64_linux_android="$TOOLCHAIN_DIR/x86_64-linux-android21-clang" -export CC_aarch64_linux_android="$TOOLCHAIN_DIR/aarch64-linux-android21-clang" -export CC_armv7_linux_androideabi="$TOOLCHAIN_DIR/armv7a-linux-androideabi21-clang" +export CC_i686_linux_android="$NDK_TOOLCHAIN_DIR/i686-linux-android21-clang" +export CC_x86_64_linux_android="$NDK_TOOLCHAIN_DIR/x86_64-linux-android21-clang" +export CC_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/aarch64-linux-android21-clang" +export CC_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/armv7a-linux-androideabi21-clang" |