diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-15 23:13:49 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-05-19 14:17:08 +0000 |
| commit | 6485310ed73bbcdf1ca1b4bcee3de089c46067e3 (patch) | |
| tree | eb0ff35961efc54f7992e027d57aba918691b893 | |
| parent | 68c5da0c271f0ac8def8cdc065c6a7c32d8bdf50 (diff) | |
| download | mullvadvpn-6485310ed73bbcdf1ca1b4bcee3de089c46067e3.tar.xz mullvadvpn-6485310ed73bbcdf1ca1b4bcee3de089c46067e3.zip | |
Allow building libwg-go without NDK script
| -rwxr-xr-x | wireguard/libwg/build-android.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh index 1acd5ee9eb..a15d7d42ab 100755 --- a/wireguard/libwg/build-android.sh +++ b/wireguard/libwg/build-android.sh @@ -38,7 +38,14 @@ for arch in arm arm64 x86_64 x86; do ;; esac - eval "$(install-ndk-toolchain $arch)" + if which install-ndk-toolchain > /dev/null; then + eval "$(install-ndk-toolchain $arch)" + else + export ANDROID_TOOLCHAIN_ROOT="$(eval "echo \$ANDROID_TOOLCHAIN_ROOT_$arch")" + export ANDROID_SYSROOT="${ANDROID_TOOLCHAIN_ROOT}/sysroot" + export ANDROID_C_COMPILER="${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_LIB_TRIPLE}-clang" + fi + export ANDROID_ARCH_NAME=$arch export PATH="$PATH:${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin" |