Fixes based on feedback

Author: Pururun

.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

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")

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())