build: Add x86_64 ABI support

Author: Dicot0721

app/build.gradle.kts

@@ -20,7 +20,7 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         ndk {
-            abiFilters += listOf("arm64-v8a" /*, "x86_64" */)
+            abiFilters += listOf("arm64-v8a", "x86_64")
         }
 
         buildConfigField("String", "Version", "\"v${versionName}\"")

app/src/main/cpp/native-lib.cpp

@@ -286,6 +286,7 @@ Java_net_rpcsx_RPCSX_getVersion(JNIEnv *env, jobject) {
 extern "C" JNIEXPORT jboolean JNICALL
 Java_net_rpcsx_RPCSX_setCustomDriver(JNIEnv *env, jobject, jstring jpath,
                                      jstring jlibraryName, jstring jhookDir) {
+#ifdef __aarch64__
   if (rpcsxLib.setCustomDriver == nullptr) {
     return false;
   }
@@ -318,4 +319,7 @@ Java_net_rpcsx_RPCSX_setCustomDriver(JNIEnv *env, jobject, jstring jpath,
   }
 
   return true;
-}
+#else
+  return false;
+#endif // __aarch64__
+}

app/src/main/java/net/rpcsx/ui/navigation/AppNavHost.kt

@@ -34,8 +34,6 @@ import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DrawerValue
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.HorizontalDivider
@@ -47,7 +45,6 @@ import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.NavigationDrawerItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
@@ -368,7 +365,6 @@ fun AppNavHost() {
         composable(
             route = "rpcsx_channels"
         ) {
-            var downloadArch by remember { mutableStateOf(RpcsxUpdater.getArch()) }
             UpdateChannelListScreen(
                 navigateBack = navController::navigateUp,
                 title = stringResource(R.string.rpcsx_download_channel),
@@ -426,37 +422,6 @@ fun AppNavHost() {
                     }
                 },
                 isDeletable = { isValidChannel(it, ReleaseRpcsxChannel, DevRpcsxChannel) },
-                actions = {
-                    var expanded by remember { mutableStateOf(false) }
-
-                    TextButton(onClick = { expanded = true }) {
-                        Text(downloadArch)
-                    }
-
-                    DropdownMenu(
-                        expanded = expanded,
-                        onDismissRequest = { expanded = false }
-                    ) {
-                        listOf(
-                            "armv8-a",
-                            "armv8.1-a",
-                            "armv8.2-a",
-                            "armv8.4-a",
-                            "armv8.5-a",
-                            "armv9-a",
-                            "armv9.1-a",
-                        ).forEach { arch ->
-                            DropdownMenuItem(
-                                text = { Text(arch) },
-                                onClick = {
-                                    RpcsxUpdater.setArch(arch)
-                                    downloadArch = arch
-                                    expanded = false
-                                }
-                            )
-                        }
-                    }
-                }
             )
         }
 

app/src/main/java/net/rpcsx/utils/RpcsxUpdater.kt

@@ -2,6 +2,7 @@ package net.rpcsx.utils
 
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.util.Log
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -40,12 +41,15 @@ object RpcsxUpdater {
         return "$version-$arch"
     }
 
-    fun getArch(): String {
-        return GeneralSettings["rpcsx_arch"] as? String ?: "armv8-a"
+    fun getAbi(): String {
+        return Build.SUPPORTED_64_BIT_ABIS[0]
     }
 
-    fun setArch(arch: String) {
-        GeneralSettings["rpcsx_arch"] = arch
+    fun getArch(): String {
+        return when (getAbi()) {
+            "x86_64" -> "x86-64"
+            else -> "armv8-a"
+        }
     }
 
     suspend fun checkForUpdate(): String? {
@@ -57,7 +61,7 @@ object RpcsxUpdater {
                 val release = fetchResult.content as GitHub.Release
                 val releaseVersion = "${release.name}-${arch}"
 
-                if (release.assets.find { it.name == "librpcsx-android-arm64-v8a-${arch}.so" }?.browser_download_url == null) {
+                if (release.assets.find { it.name == "librpcsx-android-${getAbi()}-${arch}.so" }?.browser_download_url == null) {
                     return null
                 }
 
@@ -85,7 +89,7 @@ object RpcsxUpdater {
             is GitHub.FetchResult.Success<*> -> {
                 val release = fetchResult.content as GitHub.Release
                 val releaseVersion = "${release.name}-${arch}"
-                val releaseAsset = release.assets.find { it.name == "librpcsx-android-arm64-v8a-$arch.so" }
+                val releaseAsset = release.assets.find { it.name == "librpcsx-android-${getAbi()}-$arch.so" }
 
                 if (releaseVersion != getCurrentVersion() && releaseAsset?.browser_download_url != null) {
                     val target = File(destinationDir, "librpcsx-android_${arch}_${release.name}.so")