From ab3d61fff93f44d3368a1e5251953608b1ea3836 Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Fri, 20 Dec 2024 15:47:18 +0100
Subject: [PATCH] Fixes based on feedback

---
 .github/workflows/android-app.yml | 14 +++++---------
 android/app/build.gradle.kts      |  3 ---
 wireguard-go-rs/build.rs          |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 7048992b406a..fcc4b35a2995 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -157,17 +157,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - arch: "x86_64"
-            abi: "x86_64"
+          - abi: "x86_64"
             task-variant: "X86_64"
-          - arch: "i686"
-            abi: "x86"
+          - abi: "x86"
             task-variant: "X86"
-          - arch: "aarch64"
-            abi: "arm64-v8a"
+          - abi: "arm64-v8a"
             task-variant: "Arm64"
-          - arch: "armv7"
-            abi: "armeabi-v7a"
+          - abi: "armeabi-v7a"
             task-variant: "Arm"
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
@@ -222,7 +218,7 @@ jobs:
       - name: Upload native libs
         uses: actions/upload-artifact@v4
         with:
-          name: native-libs-${{ matrix.arch }}
+          name: native-libs-${{ matrix.abi }}
           path: android/app/build/rustJniLibs/android
           if-no-files-found: error
           retention-days: 7
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 5b67d7394bc5..dd1444302cb4 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -296,9 +296,6 @@ tasks.register<Exec>("generateRelayList") {
     workingDir = File(repoRootPath)
     standardOutput = ByteArrayOutputStream()
 
-    // Set this if you get a cargo not found error
-    // environment =
-
     onlyIf { isReleaseBuild() || !relayListPath.exists() }
 
     commandLine("cargo", "run", "--bin", "relay_list")
diff --git a/wireguard-go-rs/build.rs b/wireguard-go-rs/build.rs
index 515f2579b8f8..c011cf9c3089 100644
--- a/wireguard-go-rs/build.rs
+++ b/wireguard-go-rs/build.rs
@@ -234,7 +234,7 @@ fn android_move_binary(binary: &Path, output: &Path) -> anyhow::Result<()> {
 
     let mut copy_command = Command::new("cp");
     // -p command is required to preserve ownership and timestamp of the file to prevent a
-    // rebuild of this module everytime.
+    // rebuild of this module every time.
     copy_command
         .arg("-p")
         .arg(binary.to_str().unwrap())