summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-11-27 11:06:08 +0100
committerAlbin <albin@mullvad.net>2023-11-27 11:06:08 +0100
commit2e41c80afb390a5f4e696f31a273a11417ffaefe (patch)
tree3ea82e8a846cb6dc09d6db6f738b5f887037f2d3
parent3dabafaca35cbfa8810f5acd105bceaef22a09a2 (diff)
parent15f026670148ee750621110d1a891ee460ee63c3 (diff)
downloadmullvadvpn-2e41c80afb390a5f4e696f31a273a11417ffaefe.tar.xz
mullvadvpn-2e41c80afb390a5f4e696f31a273a11417ffaefe.zip
Merge branch 'only-build-devmole-and-stagemole-builds-when-api-override-supported-droid-539'
-rwxr-xr-xbuild-apk.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build-apk.sh b/build-apk.sh
index 6add95e4a4..90a395c33e 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -13,8 +13,8 @@ echo ""
BUILD_TYPE="release"
GRADLE_BUILD_TYPE="release"
-GRADLE_TASKS=(createOssProdReleaseDistApk createPlayProdReleaseDistApk createPlayDevmoleReleaseDistApk createPlayStagemoleReleaseDistApk)
-BUNDLE_TASKS=(createPlayProdReleaseDistBundle createPlayDevmoleReleaseDistBundle createPlayStagemoleReleaseDistBundle)
+GRADLE_TASKS=(createOssProdReleaseDistApk createPlayProdReleaseDistApk)
+BUNDLE_TASKS=(createPlayProdReleaseDistBundle)
CARGO_ARGS="--release"
EXTRA_WGGO_ARGS=""
BUILD_BUNDLE="no"
@@ -58,6 +58,8 @@ if [[ "$BUILD_TYPE" == "release" && "$PRODUCT_VERSION" != *"-dev-"* ]]; then
CARGO_ARGS+=" --locked"
else
CARGO_ARGS+=" --features api-override"
+ GRADLE_TASKS+=(createPlayDevmoleReleaseDistApk createPlayStagemoleReleaseDistApk)
+ BUNDLE_TASKS+=(createPlayDevmoleReleaseDistBundle createPlayStagemoleReleaseDistBundle)
fi
pushd "$SCRIPT_DIR/android"