Merge branch 'fix-ram-limits-for-reproducible-build-check-droid-2634'

Author: albin-mullvad

.github/workflows/android-reproducible-builds.yml

@@ -63,12 +63,9 @@ jobs:
         run: |
           git fetch --no-tags origin 'refs/tags/android/*:refs/tags/android/*'
 
-      - name: Lower available memory for gradle
-        run: |
-          sed -i 's|^org\.gradle\.jvmargs=.*|org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\\="-Xmx4096M"|' \
-          android/gradle.properties
-
       - name: Build app
+        env:
+          GRADLE_OPTS: '-Dorg.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options="-Xmx4096M"'
         run: ./building/containerized-build.sh android --oss-only
 
       - name: Upload apks
@@ -172,6 +169,8 @@ jobs:
       - uses: cachix/install-nix-action@v31
 
       - name: Build app
+        env:
+          GRADLE_OPTS: '-Dorg.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options="-Xmx4096M"'
         run: nix develop .#android -c buildRelease
 
       - name: Upload apks
@@ -209,9 +208,10 @@ jobs:
 
       - name: Compare apk against source of truth
         working-directory: ./artifacts
-        run: diff \
-          apk-container/app-oss-prod-release-unsigned.apk \
-          ${{ matrix.artifact}}/app-oss-prod-release-unsigned.apk
+        run: >-
+          diff
+          apk-container/app-oss-prod-release-unsigned.apk
+          ${{ matrix.artifact }}/app-oss-prod-release-unsigned.apk
 
   # Included in this workflow since it's the only place
   # release artifacts are built. Should eventually be moved.

android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml

@@ -44,13 +44,13 @@ Builds:
       - sed -i -e '/billing/d' ../settings.gradle.kts
       - sed -i -e '/projects.lib.billing/d' build.gradle.kts
       - sed -i '/\"desktop\//d' ../../Cargo.toml
-      # This is to increase stability of verification builds, not required for official fdroid builds
-      - sed -i 's/8192M/4096M/g' ../gradle.properties
     scanignore:
       - android/rust-android-gradle-plugin/plugin/build.gradle.kts
     build:
       - NDK_PATH="$$NDK$$" source ../fdroid-build/env.sh
       - echo $NDK_TOOLCHAIN_DIR "$$NDK$$"
+      # This is to increase stability of verification builds, not required for official fdroid builds
+      - export GRADLE_OPTS='-Dorg.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options="-Xmx4096M"'
       - ../build.sh --oss-only --skip-clean-check
     ndk: 27.3.13750724
 

building/container-run.sh

@@ -16,6 +16,7 @@ CARGO_REGISTRY_VOLUME_NAME=${CARGO_REGISTRY_VOLUME_NAME:-"cargo-registry"}
 GRADLE_CACHE_VOLUME_NAME=${GRADLE_CACHE_VOLUME_NAME:-"gradle-cache"}
 CONTAINER_RUNNER=${CONTAINER_RUNNER:-"podman"}
 PLAY_CREDENTIALS_PATH=${PLAY_CREDENTIALS_PATH:-""}
+GRADLE_OPTS=${GRADLE_OPTS:-""}
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 REPO_DIR="$( cd "$SCRIPT_DIR/.." && pwd )"
@@ -53,4 +54,5 @@ exec "$CONTAINER_RUNNER" run --rm -it \
     -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \
     "${optional_gradle_cache_volume[@]}" \
     "${optional_play_credentials_file[@]}" \
+    ${GRADLE_OPTS:+-e GRADLE_OPTS="$GRADLE_OPTS"} \
     "$container_image_name" bash -c "$*"