diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-06 21:28:54 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-07 14:26:04 +0000 |
| commit | d88e9fbac396cd5a33a503caad9d97fb1cb76c17 (patch) | |
| tree | 9ea0232f936f39f7879796baaa68fec5cf21110c /wireguard | |
| parent | 66e374e6d4c686c19506ddeb45c09a70818d26e1 (diff) | |
| download | mullvadvpn-d88e9fbac396cd5a33a503caad9d97fb1cb76c17.tar.xz mullvadvpn-d88e9fbac396cd5a33a503caad9d97fb1cb76c17.zip | |
Use prebuild toolchain
Diffstat (limited to 'wireguard')
| -rw-r--r-- | wireguard/libwg/Android.mk | 5 | ||||
| -rwxr-xr-x | wireguard/libwg/build-android.sh | 15 |
2 files changed, 3 insertions, 17 deletions
diff --git a/wireguard/libwg/Android.mk b/wireguard/libwg/Android.mk index 6b31ffeb80..76cc620139 100644 --- a/wireguard/libwg/Android.mk +++ b/wireguard/libwg/Android.mk @@ -11,9 +11,8 @@ NDK_GO_ARCH_MAP_arm64 := arm64 NDK_GO_ARCH_MAP_mips := mipsx NDK_GO_ARCH_MAP_mips64 := mips64x -CLANG_FLAGS := --target=$(ANDROID_LLVM_TRIPLE) --gcc-toolchain=$(ANDROID_TOOLCHAIN_ROOT) --sysroot=$(ANDROID_SYSROOT) -export CGO_CFLAGS := $(CLANG_FLAGS) $(CFLAGS) -export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS) +export CGO_CFLAGS := $(CFLAGS) +export CGO_LDFLAGS := $(LDFLAGS) export CC := $(ANDROID_C_COMPILER) export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME)) export GOOS := android diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh index a15d7d42ab..b009195a30 100755 --- a/wireguard/libwg/build-android.sh +++ b/wireguard/libwg/build-android.sh @@ -14,47 +14,34 @@ for arch in arm arm64 x86_64 x86; do case "$arch" in "arm64") export ANDROID_LLVM_TRIPLE="aarch64-linux-android" - export ANDROID_LIB_TRIPLE="aarch64-linux-android" export RUST_TARGET_TRIPLE="aarch64-linux-android" export ANDROID_ABI="arm64-v8a" ;; "x86_64") export ANDROID_LLVM_TRIPLE="x86_64-linux-android" - export ANDROID_LIB_TRIPLE="x86_64-linux-android" export RUST_TARGET_TRIPLE="x86_64-linux-android" export ANDROID_ABI="x86_64" ;; "arm") export ANDROID_LLVM_TRIPLE="armv7a-linux-androideabi" - export ANDROID_LIB_TRIPLE="arm-linux-androideabi" export RUST_TARGET_TRIPLE="armv7-linux-androideabi" export ANDROID_ABI="armeabi-v7a" ;; "x86") export ANDROID_LLVM_TRIPLE="i686-linux-android" - export ANDROID_LIB_TRIPLE="i686-linux-android" export RUST_TARGET_TRIPLE="i686-linux-android" export ANDROID_ABI="x86" ;; esac - 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_C_COMPILER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ANDROID_LLVM_TRIPLE}21-clang" export ANDROID_ARCH_NAME=$arch - export PATH="$PATH:${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin" # Build Wireguard-Go echo $(pwd) make -f Android.mk clean export CFLAGS="-D__ANDROID_API__=21" - export LDFLAGS="-L${ANDROID_SYSROOT}/usr/lib/${ANDROID_LIB_TRIPLE}/21" make -f Android.mk # Copy build artifacts to `build/libs/$RUST_TARGET_TRIPLE` to be able to build `mullvad-jni` |