diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-01-09 14:57:16 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-01-09 14:57:16 +0100 |
| commit | f008ce5571d89d437d4bd025558823de0e6810a1 (patch) | |
| tree | 888e88997db5cd008a9d279b0607dfb910943745 | |
| parent | b01de0b0898a8104d2991278d899e9e673b03517 (diff) | |
| parent | 83c710cfd4a6b5f7760e132adc99561c4e3fba56 (diff) | |
| download | mullvadvpn-f008ce5571d89d437d4bd025558823de0e6810a1.tar.xz mullvadvpn-f008ce5571d89d437d4bd025558823de0e6810a1.zip | |
Merge branch 'androidbuildsh-checks-for-wrong-build-type-droid-1719'
| -rwxr-xr-x | android/build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/android/build.sh b/android/build.sh index 43dc034ff8..1825c52a3d 100755 --- a/android/build.sh +++ b/android/build.sh @@ -11,7 +11,6 @@ PRODUCT_VERSION=$(cargo run -q --bin mullvad-version versionName) echo "Building Mullvad VPN $PRODUCT_VERSION for Android" echo "" -BUILD_TYPE="release" GRADLE_BUILD_TYPE="release" GRADLE_TASKS=(createOssProdReleaseDistApk createPlayProdReleaseDistApk) BUILD_BUNDLE="no" @@ -21,7 +20,6 @@ PLAY_PUBLISH_TASKS=() while [ -n "${1:-""}" ]; do if [[ "${1:-""}" == "--dev-build" ]]; then - BUILD_TYPE="debug" GRADLE_BUILD_TYPE="debug" GRADLE_TASKS=(createOssProdDebugDistApk) BUNDLE_TASKS=(createOssProdDebugDistBundle) @@ -46,7 +44,7 @@ if [[ "$GRADLE_BUILD_TYPE" == "release" ]]; then fi fi -if [[ "$BUILD_TYPE" == "release" ]]; then +if [[ "$GRADLE_BUILD_TYPE" == "release" ]]; then if [[ "$PRODUCT_VERSION" == *"-dev-"* ]]; then GRADLE_TASKS+=(createPlayDevmoleReleaseDistApk createPlayStagemoleReleaseDistApk) BUNDLE_TASKS+=(createPlayDevmoleReleaseDistBundle createPlayStagemoleReleaseDistBundle) |