Merge branch 'remove-standalone-toolchains'

2 files changed, 9 insertions, 40 deletions

diff --git a/android/fdroid-build/env.sh b/android/fdroid-build/env.sh
index cdb94a3918..e510116e58 100755
--- a/android/fdroid-build/env.sh
+++ b/android/fdroid-build/env.sh
@@ -8,20 +8,14 @@ export GOROOT="$HOME/go"
 export PATH="$PATH:$GOROOT/bin"
 
 # Ensure Rust crates know which tools to use for cross-compilation
-export TOOLCHAINS_DIR="$HOME/android-ndk-toolchains"
+export TOOLCHAIN_DIR="$NDK_PATH/toolchains/llvm/prebuilt/linux-x86_64/bin"
 
-export AR_i686_linux_android="$TOOLCHAINS_DIR/android21-x86/bin/i686-linux-android-ar"
-export AR_x86_64_linux_android="$TOOLCHAINS_DIR/android21-x86_64/bin/x86_64-linux-android-ar"
-export AR_aarch64_linux_android="$TOOLCHAINS_DIR/android21-arm64/bin/aarch64-linux-android-ar"
-export AR_armv7_linux_androideabi="$TOOLCHAINS_DIR/android21-arm/bin/arm-linux-androideabi-ar"
+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 CC_i686_linux_android="$TOOLCHAINS_DIR/android21-x86/bin/i686-linux-android21-clang"
-export CC_x86_64_linux_android="$TOOLCHAINS_DIR/android21-x86_64/bin/x86_64-linux-android21-clang"
-export CC_aarch64_linux_android="$TOOLCHAINS_DIR/android21-arm64/bin/aarch64-linux-android21-clang"
-export CC_armv7_linux_androideabi="$TOOLCHAINS_DIR/android21-arm/bin/armv7a-linux-androideabi21-clang"
-
-# Ensure the C cross-compilers are accessible to the libwg-go build
-export ANDROID_TOOLCHAIN_ROOT_arm="$TOOLCHAINS_DIR/android21-arm"
-export ANDROID_TOOLCHAIN_ROOT_x86="$TOOLCHAINS_DIR/android21-x86"
-export ANDROID_TOOLCHAIN_ROOT_arm64="$TOOLCHAINS_DIR/android21-arm64"
-export ANDROID_TOOLCHAIN_ROOT_x86_64="$TOOLCHAINS_DIR/android21-x86_64"
+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"
diff --git a/android/fdroid-build/init.sh b/android/fdroid-build/init.sh
index 0386e1f9de..7b7d7c578d 100755
--- a/android/fdroid-build/init.sh
+++ b/android/fdroid-build/init.sh
@@ -26,30 +26,5 @@ echo "0804bf02020dceaa8a7d7275ee79f7a142f1996bfd0c39216ccb405f93f994c0 go1.13.3.
 tar -xzvf go1.13.3.linux-amd64.tar.gz
 patch -p1 -f -N -r- -d "$HOME/go" < "$REPO_DIR/wireguard/libwg/goruntime-boottime-over-monotonic.diff"
 
-# Prepare standalone NDK toolchains
-mkdir "$TOOLCHAINS_DIR"
-for arch in arm arm64 x86 x86_64; do
-    case "$arch" in
-        "arm64")
-            android_lib_triple="aarch64-linux-android"
-            ;;
-        "x86_64")
-            android_lib_triple="x86_64-linux-android"
-            ;;
-        "arm")
-            android_lib_triple="arm-linux-androideabi"
-            ;;
-        "x86")
-            android_lib_triple="i686-linux-android"
-            ;;
-    esac
-
-    "$NDK_PATH/build/tools/make-standalone-toolchain.sh" --platform=android-21 --arch="$arch" --install-dir="$TOOLCHAINS_DIR/android21-$arch"
-
-    for file in crtbegin_dynamic.o crtend_android.o crtbegin_so.o crtend_so.o; do
-        ln -s "$TOOLCHAINS_DIR/android21-$arch/sysroot/usr/lib/$android_lib_triple/"{21/,}"$file"
-    done
-done
-
 # Configure Cargo for cross-compilation
 sed -e "s|{NDK_PATH}|$NDK_PATH|g" "$SCRIPT_DIR/cargo-config.toml.template" > "$HOME/.cargo/config"