diff options
| author | Albin <albin@mullvad.net> | 2023-03-13 14:21:46 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-14 15:43:18 +0100 |
| commit | a7160c90b7cbefb77a769294067cb9255b5cd543 (patch) | |
| tree | 61b6565bb168d83cd7501a127bde3c899a13a7f2 | |
| parent | 54fa298a69277cf70853e00ae2926fdd525c6423 (diff) | |
| download | mullvadvpn-a7160c90b7cbefb77a769294067cb9255b5cd543.tar.xz mullvadvpn-a7160c90b7cbefb77a769294067cb9255b5cd543.zip | |
Migrate wg-go build script to use container helper script
This commit does not change anything for regular builds
using build-apk.sh.
This change migrates the wg build script from using the deprecated
container image to using the new all-in-one Android image when
building wireguard-go without the `--no-docker` argument.
| -rwxr-xr-x | wireguard/build-wireguard-go.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/wireguard/build-wireguard-go.sh b/wireguard/build-wireguard-go.sh index 0374a82892..739116b41b 100755 --- a/wireguard/build-wireguard-go.sh +++ b/wireguard/build-wireguard-go.sh @@ -120,14 +120,9 @@ function build_unix { function build_android { echo "Building for android" - local docker_image_hash="afa84a78b428163b4585d04259fad801df2ebf5ab079f53b3a90892afd18dd9f" if is_docker_build $@; then - docker run --rm \ - -v "$(pwd)/../":/workspace \ - --entrypoint "/workspace/wireguard/libwg/build-android.sh" \ - --env ANDROID_NDK_HOME="/opt/android/android-ndk-r20b" \ - quay.io/mullvad/mullvad-android-app-build@sha256:$docker_image_hash + ../building/container-run.sh android wireguard/libwg/build-android.sh else ./libwg/build-android.sh fi |