Run x86_64 Flatpak apps through FEX (#1875)

* Run x86_64 Flatpak apps through FEX

* proot: run an execveat with an absolute path like execve

* Find x86_64 Flatpak installs and resolve sandbox paths like the sandbox does
This commit is contained in:
MaxsTechReview authored and GitHub committed 2026-10-30 21:21:22 -04:00
1 parent 8088e47d14
commit 28067b3bbe
45 files changed
+494 -61

No files matched your search

@@ -119,6 +119,27 @@ class BwrapSpawnerPlanTest {
assertEquals("org.example.Game", plan.env["FLATPAK_ID"])
}
@Test fun sandboxesStartThroughTheirOwnEnvByDefault() {
val plan = BwrapSpawner.plan(RuntimeEnvironment.getApplication(), request(op("t" to "dir", "dest" to "/tmp")), dir)
assertEquals("/usr/bin/env", plan.envTool)
}
@Test fun fexSandboxesStartThroughTheEnvTheyBringAndSkipArmPreloads() {
val context = RuntimeEnvironment.getApplication()
val rootfs = LinuxRuntime.rootDir(context)
val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") }
val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") }
try {
val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp"))
.put("envTool", "/run/droiddeck-fex/bin/env"), dir)
assertEquals("/run/droiddeck-fex/bin/env", plan.envTool)
assertFalse(plan.env.containsKey("LD_PRELOAD"))
assertFalse(plan.binds.any { it.guest.startsWith("/run/droiddeck-preload") })
} finally {
listOf(lib, preload).forEach { it.delete() }
}
}
@Test fun sandboxedAppsSeeTheSessionsNetworkLink() {
val context = RuntimeEnvironment.getApplication()
val rootfs = LinuxRuntime.rootDir(context)
@@ -0,0 +1,55 @@
package com.droiddeck.launcher.runtime
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Before
import org.junit.Test
import java.io.File
import java.nio.file.Files
class FlatpakManagerArchTest {
private lateinit var dir: File
@Before fun setUp() {
dir = Files.createTempDirectory("flatpak-arch").toFile()
}
@After fun tearDown() {
dir.deleteRecursively()
}
private fun install(arch: String, branch: String) {
File(dir, "$arch/$branch/active").mkdirs()
}
@Test fun armDevicesAlsoListX86Builds() {
assertEquals(listOf("aarch64", "x86_64"), FlatpakManager.arches("aarch64"))
assertEquals(listOf("x86_64"), FlatpakManager.arches("x86_64"))
}
@Test fun anX86OnlyInstallIsFound() {
install("x86_64", "master")
val (arch, branch) = FlatpakManager.installedBranch(dir, "aarch64")!!
assertEquals("x86_64", arch)
assertEquals("master", branch.name)
}
@Test fun theNativeBuildWinsWhenBothAreInstalled() {
install("x86_64", "master")
install("aarch64", "stable")
assertEquals("aarch64", FlatpakManager.installedBranch(dir, "aarch64")!!.first)
}
@Test fun aBranchWithoutAnActiveDeployIsNotInstalled() {
File(dir, "x86_64/master").mkdirs()
assertNull(FlatpakManager.installedBranch(dir, "aarch64"))
}
@Test fun x86BuildsOnArmLaunchWithTheirArch() {
val x86 = FlatpakManager.App("io.github.ebkr.r2modman", "r2modman", null, "master", null, "x86_64")
val arm = FlatpakManager.App("org.example.App", "App", null, "stable", null, "aarch64")
assertEquals(listOf("--arch=x86_64", "io.github.ebkr.r2modman"), FlatpakManager.launchArgs(x86, "aarch64"))
assertEquals(listOf("org.example.App"), FlatpakManager.launchArgs(arm, "aarch64"))
}
}