diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-05-17 16:33:40 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-06-26 08:55:56 +0200 |
| commit | cd55664dd71751ffcf146183824a7a6e6aaea657 (patch) | |
| tree | f8e491587c8e706514a416071ff9fae31eb72482 | |
| parent | 3961cc5ee4a3c0c02a546474d02b2106b4354a1f (diff) | |
| download | mullvadvpn-cd55664dd71751ffcf146183824a7a6e6aaea657.tar.xz mullvadvpn-cd55664dd71751ffcf146183824a7a6e6aaea657.zip | |
Remove `--no-docker` flag in `build-apk.sh`
Align `build-apk.sh` with `build.sh`
| -rw-r--r-- | android/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | android/docs/BuildInstructions.macos.md | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 6 | ||||
| -rwxr-xr-x | building/containerized-build.sh | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 1ed9a1ccdc..d6b2afbfea 100644 --- 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 index f0af51b5ef..87d77fa78e 100644 --- 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 index 952fb8b5a6..517dd6f5d9 100755 --- 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 index dd8bf17fa8..86b0148a72 100755 --- 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 ;; *) |