Move workflow memory limit to GRADLE_OPTS

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

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