diff options
| author | David Göransson <david.goransson@mullvad.net> | 2026-04-21 09:42:46 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2026-04-21 15:01:20 +0200 |
| commit | 039ed22c3973f154ffc069234cea121e083af13c (patch) | |
| tree | 67f51afef9bbd45c56dea6cd067c2e0c07b21e06 | |
| parent | 04354fbbed9f738dee304d2fcd769797e7a7c305 (diff) | |
| download | mullvadvpn-039ed22c3973f154ffc069234cea121e083af13c.tar.xz mullvadvpn-039ed22c3973f154ffc069234cea121e083af13c.zip | |
Remove rust-android-gradle submodule
| -rw-r--r-- | .github/workflows/android-app.yml | 4 | ||||
| -rw-r--r-- | android/docs/BuildInstructions.macos.md | 7 | ||||
| -rw-r--r-- | android/docs/BuildInstructions.md | 9 | ||||
| -rw-r--r-- | android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml | 4 | ||||
| m--------- | android/rust-android-gradle-plugin | 0 |
5 files changed, 3 insertions, 21 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 68fbf39b4e..5efb27f7cc 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -135,10 +135,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v6.0.1 - - name: Fetch submodules - run: | - git submodule update --init android/rust-android-gradle-plugin - - name: Ensure correct container image is used run: echo "${{ needs.prepare.outputs.container_image }}" > ./building/android-container-image.txt diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md index 417d781bc8..e94a0bc14c 100644 --- a/android/docs/BuildInstructions.macos.md +++ b/android/docs/BuildInstructions.macos.md @@ -60,12 +60,7 @@ export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$NDK_TOOLCHAIN_DIR/i686-linux-and export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$NDK_TOOLCHAIN_DIR/x86_64-linux-android26-clang" ``` -## 3. Checkout required submodules -```bash -git submodule update --init android/rust-android-gradle-plugin -``` - -## 4. Debug build +## 3. Debug build ### Android Studio diff --git a/android/docs/BuildInstructions.md b/android/docs/BuildInstructions.md index 8172bc2049..6722331ab8 100644 --- a/android/docs/BuildInstructions.md +++ b/android/docs/BuildInstructions.md @@ -57,7 +57,7 @@ Run the following command to trigger a full debug build: ``` 3. Sign the release artifacts using apksigner with the following command: ```bash -apksigner sign --ks app-keys.jks (MullvadVPN)(version)(.apk|.aab) +apksigner sign --ks app-keys.jks (MullvadVPN)(version)(.apk|.aab) ``` ## Build without the provided container @@ -143,11 +143,6 @@ environment variables: .scripts/setup-rust install-hook ``` -#### 5. Checkout required submodules -```bash -git submodule update --init android/rust-android-gradle-plugin -``` - ### Debug build Run the following command to build a debug build: ```bash @@ -162,7 +157,7 @@ Run the following command to build a debug build: ``` 3. Sign the release artifacts using apksigner with the following command: ```bash - apksigner sign --ks app-keys.jks (MullvadVPN)(version)(.apk|.aab) + apksigner sign --ks app-keys.jks (MullvadVPN)(version)(.apk|.aab) ``` ## Build using nix devshell diff --git a/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml b/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml index 4b6b59bd12..00124f5a34 100644 --- a/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml +++ b/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml @@ -37,15 +37,11 @@ Builds: - building/sigstore - android/lib/billing prebuild: - - git -C ../.. submodule update --init android/rust-android-gradle-plugin - sed -i -e 's|Repositories.GradlePlugins|"https://plugins.gradle.org/m2/"|' ../build.gradle.kts - - sed -i -e '/foojay/d' ../rust-android-gradle-plugin/settings.gradle.kts - sed -i -e '/billing/d' ../settings.gradle.kts - sed -i -e '/projects.lib.billing/d' build.gradle.kts - sed -i '/\"desktop\//d' ../../Cargo.toml - scanignore: - - android/rust-android-gradle-plugin/plugin/build.gradle.kts build: - NDK_PATH="$$NDK$$" source ../fdroid-build/env.sh - echo $NDK_TOOLCHAIN_DIR "$$NDK$$" diff --git a/android/rust-android-gradle-plugin b/android/rust-android-gradle-plugin deleted file mode 160000 -Subproject 505aa265d754f915e81a4becb83c8171cf77fbc |