Remove --no-docker flag in build-apk.sh

Align `build-apk.sh` with `build.sh`
mullvad · Jun 25, 2024 · 86d5283 · 86d5283
1 parent 853c260
commit 86d5283
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/android/docker/Dockerfile b/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.

diff --git a/android/docs/BuildInstructions.macos.md b/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:

diff --git a/build-apk.sh b/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")

diff --git a/building/containerized-build.sh b/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
     ;;
     *)
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ case $platform in @@
             shift 1
         ;;
         android)
-            build_command=("./build-apk.sh" "--no-docker")
+            build_command=("./build-apk.sh")
             shift 1
         ;;
         *)
@@ Expand Down @@