Remove explicit calls to build-wireguard-go.sh and its --no-docker flag

Author: Serock3

.github/workflows/android-app.yml

@@ -195,7 +195,6 @@ jobs:
           UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so"
           STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so"
           NDK_TOOLCHAIN_STRIP_TOOL="$NDK_TOOLCHAIN_DIR/llvm-strip"
-          ./wireguard/build-wireguard-go.sh --android --no-docker
           cargo build --target ${{ matrix.target }} --verbose --package mullvad-jni --features api-override
           $NDK_TOOLCHAIN_STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH"
 

android/docker/Dockerfile

@@ -8,7 +8,7 @@
 #     -v $GRADLE_CACHE_VOLUME_NAME:/root/.gradle:Z \
 #     -v $ANDROID_CREDENTIALS_DIR:/build/android/credentials:Z \
 #     -v /path/to/repository_root:/build:Z \
-#     mullvadvpn-app-build-android ./build-apk.sh --dev-build --no-docker
+#     mullvadvpn-app-build-android ./build-apk.sh --dev-build
 #
 # See the base image Dockerfile in the repository root (../../Dockerfile)
 # for more information.

android/docs/BuildInstructions.macos.md

@@ -65,7 +65,7 @@ export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$NDK_TOOLCHAIN_DIR/x86_64-linux
 Run the build script in the root of the project to assemble all the native libraries and the app:
 
 ```bash
-./build-apk.sh --dev-build --no-docker
+./build-apk.sh --dev-build
 ```
 
 Once the build is complete you should receive a message looking similar to this:

build-apk.sh

@@ -16,7 +16,6 @@ GRADLE_BUILD_TYPE="release"
 GRADLE_TASKS=(createOssProdReleaseDistApk createPlayProdReleaseDistApk)
 BUNDLE_TASKS=(createPlayProdReleaseDistBundle)
 CARGO_ARGS=( "--release" )
-EXTRA_WGGO_ARGS=""
 BUILD_BUNDLE="no"
 CARGO_TARGET_DIR=${CARGO_TARGET_DIR:-"target"}
 SKIP_STRIPPING=${SKIP_STRIPPING:-"no"}
@@ -32,11 +31,8 @@ while [ -n "${1:-""}" ]; do
         GRADLE_BUILD_TYPE="fdroid"
         GRADLE_TASKS=(createOssProdFdroidDistApk)
         BUNDLE_TASKS=(createOssProdFdroidDistBundle)
-        EXTRA_WGGO_ARGS="--no-docker"
     elif [[ "${1:-""}" == "--app-bundle" ]]; then
         BUILD_BUNDLE="yes"
-    elif [[ "${1:-""}" == "--no-docker" ]]; then
-        EXTRA_WGGO_ARGS="--no-docker"
     elif [[ "${1:-""}" == "--skip-stripping" ]]; then
         SKIP_STRIPPING="yes"
     fi
@@ -80,8 +76,6 @@ $GRADLE_CMD --console plain clean
 mkdir -p "app/build/extraJni"
 popd
 
-#./wireguard/build-wireguard-go.sh --android $EXTRA_WGGO_ARGS
-
 for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
     case "$ARCHITECTURE" in
         "x86_64")

build.sh

@@ -218,11 +218,6 @@ function build {
     # Compile and link all binaries.
     ################################################################################
 
-    if [[ "$(uname -s)" != "MINGW"* ]]; then
-        log_header "Building wireguard-go$for_target_string"
-        ./wireguard/build-wireguard-go.sh "$current_target"
-    fi
-
     log_header "Building Rust code in $RUST_BUILD_MODE mode using $RUSTC_VERSION$for_target_string"
 
     local cargo_target_arg=()
@@ -317,6 +312,7 @@ for t in "${TARGETS[@]:-""}"; do
     build "$t"
 done
 
+
 ################################################################################
 # Package app.
 ################################################################################

building/containerized-build.sh

@@ -18,7 +18,7 @@ case $platform in
         shift 1
     ;;
     android)
-        build_command=("./build-apk.sh" "--no-docker")
+        build_command=("./build-apk.sh")
         shift 1
     ;;
     *)

ci/check-rust.sh

@@ -4,11 +4,6 @@ set -eux
 
 export RUSTFLAGS="--deny warnings"
 
-# Build WireGuard Go
-if [[ "$(uname -s)" != "MINGW"* ]]; then
-    ./wireguard/build-wireguard-go.sh
-fi
-
 # Build Rust crates
 source env.sh
 time cargo build --locked --verbose

wireguard-go-rs/build-wireguard-go.sh

@@ -15,17 +15,6 @@ function is_android_build {
     return 1
 }
 
-function is_docker_build {
-    for arg in "$@"
-    do
-        case "$arg" in
-            "--no-docker")
-                return 1
-        esac
-    done
-    return 0
-}
-
 function unix_target_triple {
     local platform
     platform="$(uname -s)"
@@ -48,6 +37,7 @@ function unix_target_triple {
 
 
 function build_unix {
+    # TODO: consider using `log_header` here
     echo "Building wireguard-go for $1"
 
     # Flags for cross compiling
@@ -88,13 +78,9 @@ function build_unix {
 }
 
 function build_android {
-    echo "Building for android"
+    echo "Building wireguard-go for android"
 
-    if is_docker_build "$@"; then
-        ../building/container-run.sh android wireguard-go-rs/libwg/build-android.sh
-    else
-        ./libwg/build-android.sh
-    fi
+    ./libwg/build-android.sh
 }
 
 function build_wireguard_go {

wireguard-go-rs/build.rs

@@ -13,7 +13,7 @@ fn main() {
     match target_os.as_str() {
         "linux" => {}
         "android" => {
-            cmd.arg("--android").arg("--no-docker");
+            cmd.arg("--android");
         }
         _ => unimplemented!("building wireguard-go-rs for {target_os} is not implemented."),
     }