A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
Release v1.0.9 with QEMU 11 builder and setup storage toggle
ExTv3daefdfee365
diff --git a/.gitignore b/.gitignoreindex b62ec4b..b75bafa 100644--- a/.gitignore+++ b/.gitignore@@ -33,6 +33,8 @@ config.log# Generated assets (built by docker-build-initramfs.sh)app/src/main/assets/vmlinuz-virtapp/src/main/assets/initrd.img+app/src/main/jniLibs/arm64-v8a/libqemu-system-aarch64.so+app/src/main/jniLibs/arm64-v8a/libslirp.so# Claude Code sessions.claude/diff --git a/Dockerfile.qemu b/Dockerfile.qemuindex 6d35437..3e150e0 100644--- a/Dockerfile.qemu+++ b/Dockerfile.qemu@@ -1,5 +1,5 @@# ─────────────────────────────────────────────────────────────────────────────-# Podroid — QEMU 10.2.1 Android ARM64 builder+# Podroid — QEMU 11.0.0-rc2 Android ARM64 builder## Produces:# libqemu-system-aarch64.so — QEMU executable (PIE, packaged as .so)@@ -10,7 +10,7 @@# TCG, KVM, QMP, SLIRP user networking (bundled), virtio-9p (virtfs) for# Downloads sharing#-# QEMU version pinned to 10.2.1.+# QEMU version pinned via build arg.# Android 15+ on Pixel (Tensor) uses PAC (Pointer Authentication). QEMU's default# sigaltstack coroutine backend calls siglongjmp across alternate signal stacks,# which fails PAC validation and raises SIGILL (ESR PAC Exception).@@ -20,6 +20,10 @@FROM debian:bookworm AS builder+ARG QEMU_VERSION=11.0.0-rc2+ENV QEMU_VERSION=${QEMU_VERSION}+ENV QEMU_DIR=qemu-${QEMU_VERSION}+ENV DEBIAN_FRONTEND=noninteractiveRUN apt-get update && apt-get install -y --no-install-recommends \@@ -165,22 +169,25 @@ RUN wget -q https://download.gnome.org/sources/glib/2.82/glib-2.82.5.tar.xz \&& cd / && rm -rf glib-2.82.5*# ── pixman (static — required by QEMU even with -display none) ───────────────-# 0.44+ is meson-only; use 0.42.2 which still has autotools-RUN wget -q https://www.cairographics.org/releases/pixman-0.42.2.tar.gz \- && tar xf pixman-0.42.2.tar.gz && cd pixman-0.42.2 \- && ./configure \- --host=${TARGET} \- --prefix=${PREFIX} \- --enable-static \- --disable-shared \- --disable-arm-iwmmxt \- --disable-arm-simd \- --disable-arm-neon \- --disable-arm-a64-neon \- ac_cv_arm_a64_neon=no \- CC="${CC}" CFLAGS="${CFLAGS}" AR="${AR}" RANLIB="${RANLIB}" \- && make -j$(nproc) install \- && cd / && rm -rf pixman-0.42.2*+# Newer pixman releases are meson-only. Disable aarch64 NEON asm for Android+# cross-builds; cairo's own CI carries the same workaround.+RUN wget -q https://cairographics.org/releases/pixman-0.44.2.tar.xz \+ && tar xf pixman-0.44.2.tar.xz && cd pixman-0.44.2 \+ && PKG_CONFIG_LIBDIR=${PKG_CONFIG_PATH} \+ PKG_CONFIG_PATH=${PKG_CONFIG_PATH} \+ meson setup _build \+ --cross-file /opt/cross-android-aarch64.ini \+ --prefix ${PREFIX} \+ --default-library static \+ --buildtype release \+ -Dtests=disabled \+ -Dgtk=disabled \+ -Dlibpng=disabled \+ -Dopenmp=disabled \+ -Da64-neon=disabled \+ && ninja -C _build -j$(nproc) \+ && ninja -C _build install \+ && cd / && rm -rf pixman-0.44.2*# ── libattr (static — xattr support for virtfs/9p) ───────────────────────────RUN wget -q https://download.savannah.gnu.org/releases/attr/attr-2.5.2.tar.gz \@@ -201,21 +208,50 @@ RUN wget -q https://download.savannah.gnu.org/releases/attr/attr-2.5.2.tar.gz \&& cp ${PREFIX}/lib/libattr.a \${SYSROOT}/usr/lib/aarch64-linux-android/34/libattr.a-# ── QEMU 10.2.1 ──────────────────────────────────────────────────────────────-RUN wget -q https://download.qemu.org/qemu-10.2.1.tar.xz \- && tar xf qemu-10.2.1.tar.xz+# ── libucontext (static — provides getcontext/swapcontext on Android) ────────+RUN git clone --depth=1 https://github.com/kaniini/libucontext.git /tmp/libucontext \+ && make -C /tmp/libucontext \+ ARCH=aarch64 \+ CC="${CC}" \+ AR="${AR}" \+ RANLIB="${RANLIB}" \+ CFLAGS="${CFLAGS}" \+ LDFLAGS="${LDFLAGS}" \+ BUILD_POSIX=no \+ FREESTANDING=no \+ EXPORT_UNPREFIXED=yes \+ && install -Dm644 /tmp/libucontext/libucontext.a ${PREFIX}/lib/libucontext.a \+ && install -Dm644 /tmp/libucontext/include/libucontext/libucontext.h ${PREFIX}/include/libucontext/libucontext.h \+ && install -Dm644 /tmp/libucontext/arch/common/include/libucontext/bits.h ${PREFIX}/include/libucontext/bits.h \+ && printf '%s\n' \+ '#ifndef PODROID_UCONTEXT_SHIM_H' \+ '#define PODROID_UCONTEXT_SHIM_H' \+ '#include_next <ucontext.h>' \+ '#include <libucontext/libucontext.h>' \+ '#define getcontext libucontext_getcontext' \+ '#define makecontext libucontext_makecontext' \+ '#define setcontext libucontext_setcontext' \+ '#define swapcontext libucontext_swapcontext' \+ '#endif' \+ > ${PREFIX}/include/ucontext.h \+ && rm -rf /tmp/libucontext++# ── QEMU ─────────────────────────────────────────────────────────────────────+RUN wget -q https://download.qemu.org/${QEMU_DIR}.tar.xz \+ && tar xf ${QEMU_DIR}.tar.xz# Patch 1 (VirtuDroid android-no-librt): make librt optional.# Android Bionic does not have a separate librt; the functions are in libc.RUN sed -i "s/rt = cc.find_library('rt', required: true)/rt = cc.find_library('rt', required: false)/" \- qemu-10.2.1/meson.build+ ${QEMU_DIR}/meson.build# Patch 2 (VirtuDroid android-no-shm-open): use memfd_create instead of shm_open on Android.# shm_open is not exported by Android's NDK libc stubs; memfd_create (API 26+) gives# the same anonymous-shared-memory semantics that qemu_shm_alloc() needs.RUN python3 - << 'PYEOF'import re, sys-path = 'qemu-10.2.1/util/oslib-posix.c'+import os+path = os.path.join(os.environ['QEMU_DIR'], 'util/oslib-posix.c')src = open(path).read()android_impl = r'''#ifdef __ANDROID__#include <sys/syscall.h>@@ -261,7 +297,8 @@ PYEOF# separate libattr-devel. We override the dependency check to unblock configure.RUN python3 - << 'PYEOF'import re-path = 'qemu-10.2.1/meson.build'+import os+path = os.path.join(os.environ['QEMU_DIR'], 'meson.build')src = open(path).read()# QEMU 11.x pattern@@ -289,10 +326,10 @@ PYEOF# Android sys/stat.h defines st_atime_nsec etc. as macros which clash with# QEMU's 9p struct field declarations. Undefine them before the header.RUN printf '#undef st_atime_nsec\n#undef st_mtime_nsec\n#undef st_ctime_nsec\n' \- | cat - qemu-10.2.1/fsdev/9p-marshal.h > /tmp/9p-marshal.h \- && mv /tmp/9p-marshal.h qemu-10.2.1/fsdev/9p-marshal.h+ | cat - ${QEMU_DIR}/fsdev/9p-marshal.h > /tmp/9p-marshal.h \+ && mv /tmp/9p-marshal.h ${QEMU_DIR}/fsdev/9p-marshal.h-RUN cd qemu-10.2.1 \+RUN cd ${QEMU_DIR} \&& PKG_CONFIG_PATH=${PKG_CONFIG_PATH} \./configure \--cc="${CC}" \@@ -300,7 +337,7 @@ RUN cd qemu-10.2.1 \--host-cc="gcc" \--cross-prefix="${LLVM}/bin/llvm-" \--extra-cflags="-fPIC -DANDROID -march=armv8-a -I${PREFIX}/include -I${PREFIX}/include/glib-2.0 -I${PREFIX}/lib/glib-2.0/include -Wno-error=implicit-function-declaration" \- --extra-ldflags="-L${PREFIX}/lib -L${SYSROOT}/usr/lib/aarch64-linux-android/${API} -Wl,-rpath-link,${PREFIX}/lib -Wl,-z,max-page-size=16384" \+ --extra-ldflags="-L${PREFIX}/lib -L${SYSROOT}/usr/lib/aarch64-linux-android/${API} -Wl,-rpath-link,${PREFIX}/lib -Wl,-z,max-page-size=16384 ${PREFIX}/lib/libucontext.a" \--prefix=/opt/qemu-out \--target-list=aarch64-softmmu \--without-default-features \@@ -326,7 +363,10 @@ RUN cd qemu-10.2.1 \--disable-vde \--disable-linux-io-uring \--with-coroutine=ucontext \+ && python3 -c "import json, pathlib; p = pathlib.Path('build/meson-info/intro-buildoptions.json'); opts = {e['name']: e.get('value') for e in json.loads(p.read_text())}; assert p.exists(), p; assert opts.get('virtfs') == 'enabled', opts.get('virtfs'); assert opts.get('slirp') == 'enabled', opts.get('slirp'); assert opts.get('coroutine_backend') == 'ucontext', opts.get('coroutine_backend')" \&& make -j$(nproc) \+ && find build -path '*coroutine-ucontext*.o' -print -quit | grep -q . \+ && ! find build -path '*coroutine-sigaltstack*.o' -print -quit | grep -q . \&& make install# ── Rename binary to .so; fix libslirp soname for Android APK packaging ───────@@ -339,9 +379,7 @@ RUN cp /opt/qemu-out/bin/qemu-system-aarch64 \/opt/qemu-out/libslirp.so \&& patchelf --set-soname libslirp.so /opt/qemu-out/libslirp.so \&& patchelf --replace-needed libslirp.so.0 libslirp.so \- /opt/qemu-out/libqemu-system-aarch64.so \- && ${STRIP} /opt/qemu-out/libqemu-system-aarch64.so \- && ${STRIP} /opt/qemu-out/libslirp.so+ /opt/qemu-out/libqemu-system-aarch64.so# ── Final image with just the artifacts ───────────────────────────────────────FROM debian:bookworm-slim AS artifactsdiff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex cdd39f8..c1bed56 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -11,6 +11,8 @@ plugins {alias(libs.plugins.hilt.android)}+val podroidQemuVersion = providers.gradleProperty("podroidQemuVersion").get()+android {namespace = "com.excp.podroid"compileSdk {@@ -25,6 +27,7 @@ android {targetSdk = 36versionCode = 12versionName = "1.0.9"+ buildConfigField("String", "QEMU_VERSION", "\"$podroidQemuVersion\"")testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"diff --git a/app/src/main/java/com/excp/podroid/MainActivity.kt b/app/src/main/java/com/excp/podroid/MainActivity.ktindex df764a7..a9ab5b6 100644--- a/app/src/main/java/com/excp/podroid/MainActivity.kt+++ b/app/src/main/java/com/excp/podroid/MainActivity.kt@@ -1,12 +1,8 @@package com.excp.podroidimport android.Manifest-import android.content.Intentimport android.content.pm.PackageManager-import android.net.Uriimport android.os.Bundle-import android.os.Environment-import android.provider.Settingsimport androidx.activity.ComponentActivityimport androidx.activity.compose.setContentimport androidx.activity.enableEdgeToEdge@@ -28,7 +24,6 @@ class MainActivity : ComponentActivity() {override fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)requestNotificationPermissionIfNeeded()- requestStoragePermissionIfNeeded()enableEdgeToEdge()setContent {val darkTheme by settingsRepository.darkTheme.collectAsState(initial = true)@@ -50,16 +45,4 @@ class MainActivity : ComponentActivity() {)}}-- private fun requestStoragePermissionIfNeeded() {- if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.R) return- if (!Environment.isExternalStorageManager()) {- startActivity(- Intent(- Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,- Uri.parse("package:$packageName"),- )- )- }- }}diff --git a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.ktindex e59a8d5..7b5f235 100644--- a/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt+++ b/app/src/main/java/com/excp/podroid/data/repository/SettingsRepository.kt@@ -33,6 +33,7 @@ class SettingsRepository @Inject constructor(val KEY_VM_CPUS = intPreferencesKey("vm_cpus")val KEY_FONT_SIZE = intPreferencesKey("terminal_font_size")val KEY_STORAGE_GB = intPreferencesKey("storage_gb")+ val KEY_STORAGE_ACCESS_ENABLED = booleanPreferencesKey("storage_access_enabled")val KEY_SETUP_DONE = booleanPreferencesKey("setup_done")val KEY_SSH_ENABLED = booleanPreferencesKey("ssh_enabled")}@@ -52,6 +53,9 @@ class SettingsRepository @Inject constructor(val storageSizeGb: Flow<Int> = context.dataStore.data.map { it[KEY_STORAGE_GB] ?: 2 }+ val storageAccessEnabled: Flow<Boolean> = context.dataStore.data+ .map { it[KEY_STORAGE_ACCESS_ENABLED] ?: false }+val isSetupDone: Flow<Boolean> = context.dataStore.data.map { it[KEY_SETUP_DONE] ?: false }@@ -73,6 +77,9 @@ class SettingsRepository @Inject constructor(suspend fun setStorageSizeGb(value: Int) =context.dataStore.edit { it[KEY_STORAGE_GB] = value }+ suspend fun setStorageAccessEnabled(value: Boolean) =+ context.dataStore.edit { it[KEY_STORAGE_ACCESS_ENABLED] = value }+suspend fun markSetupDone() =context.dataStore.edit { it[KEY_SETUP_DONE] = true }@@ -91,6 +98,9 @@ class SettingsRepository @Inject constructor(suspend fun getStorageSizeGbSnapshot(): Int =context.dataStore.data.map { it[KEY_STORAGE_GB] ?: 2 }.first()+ suspend fun getStorageAccessEnabledSnapshot(): Boolean =+ context.dataStore.data.map { it[KEY_STORAGE_ACCESS_ENABLED] ?: false }.first()+suspend fun isSetupDoneSnapshot(): Boolean =context.dataStore.data.map { it[KEY_SETUP_DONE] ?: false }.first()}diff --git a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.ktindex 9c5b79f..46dd323 100644--- a/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt+++ b/app/src/main/java/com/excp/podroid/engine/PodroidQemu.kt@@ -361,8 +361,13 @@ class PodroidQemu @Inject constructor(val downloadsDir = android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS)+ val storageAccessEnabled = kotlinx.coroutines.runBlocking {+ settingsRepository.getStorageAccessEnabledSnapshot()+ }if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R &&- android.os.Environment.isExternalStorageManager() && downloadsDir.exists()) {+ storageAccessEnabled &&+ android.os.Environment.isExternalStorageManager() &&+ downloadsDir.exists()) {args += "-fsdev"args += "local,id=fsdev0,path=${downloadsDir.absolutePath},security_model=none"args += "-device"diff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.ktindex 347b2b4..1c589f4 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeScreen.kt@@ -2,6 +2,7 @@ package com.excp.podroid.ui.screens.homeimport android.content.Intentimport android.net.Uri+import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Spacer@@ -109,20 +110,22 @@ fun HomeScreen(Spacer(modifier = Modifier.height(24.dp))// Status icon- when {- isStarting -> CircularProgressIndicator(- modifier = Modifier.size(72.dp),- strokeWidth = 5.dp,- )- else -> Icon(- imageVector = Icons.Default.Terminal,- contentDescription = null,- modifier = Modifier.size(72.dp),- tint = if (isRunning)- MaterialTheme.colorScheme.primary- else- MaterialTheme.colorScheme.onSurfaceVariant,- )+ Box(modifier = Modifier.size(72.dp), contentAlignment = Alignment.Center) {+ when {+ isStarting -> CircularProgressIndicator(+ modifier = Modifier.size(72.dp),+ strokeWidth = 5.dp,+ )+ else -> Icon(+ imageVector = Icons.Default.Terminal,+ contentDescription = null,+ modifier = Modifier.size(72.dp),+ tint = if (isRunning)+ MaterialTheme.colorScheme.primary+ else+ MaterialTheme.colorScheme.onSurfaceVariant,+ )+ }}// Status textdiff --git a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.ktindex f1a1b59..fc1078a 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/home/HomeViewModel.kt@@ -4,6 +4,7 @@ import android.content.Contextimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopeimport com.excp.podroid.BuildConfig+import com.excp.podroid.data.repository.SettingsRepositoryimport com.excp.podroid.data.repository.UpdateInfoimport com.excp.podroid.data.repository.UpdateRepositoryimport com.excp.podroid.engine.PodroidQemu@@ -24,6 +25,7 @@ import javax.inject.Injectclass HomeViewModel @Inject constructor(@ApplicationContext private val context: Context,private val podroidQemu: PodroidQemu,+ private val settingsRepository: SettingsRepository,private val updateRepository: UpdateRepository,) : ViewModel() {@@ -33,6 +35,9 @@ class HomeViewModel @Inject constructor(val bootStage: StateFlow<String> = podroidQemu.bootStage.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "")+ val storageAccessEnabled: StateFlow<Boolean> = settingsRepository.storageAccessEnabled+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), false)+private val _updateInfo = MutableStateFlow<UpdateInfo?>(null)val updateInfo: StateFlow<UpdateInfo?> = _updateInfo.asStateFlow()@@ -61,6 +66,12 @@ class HomeViewModel @Inject constructor(PodroidService.start(context)}+ fun setStorageAccessEnabled(enabled: Boolean) {+ viewModelScope.launch {+ settingsRepository.setStorageAccessEnabled(enabled)+ }+ }+fun stopVm() {PodroidService.stop(context)}diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.ktindex 338a488..fe43b13 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt@@ -375,7 +375,7 @@ fun SettingsScreen(SettingsSectionHeader("About")SettingsInfoRow("Version", BuildConfig.VERSION_NAME)- SettingsInfoRow("QEMU", "11.0.0-rc2 (rebuilt)")+ SettingsInfoRow("QEMU", BuildConfig.QEMU_VERSION)SettingsInfoRow("Architecture", "AArch64 (ARM64)")SettingsInfoRow("Linux distro", "Alpine Linux 3.23")SettingsInfoRow("Container runtime", "Podman + crun")diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.ktindex d7ae8b0..02f5d74 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt@@ -1,5 +1,10 @@package com.excp.podroid.ui.screens.setup+import android.content.Intent+import android.net.Uri+import android.os.Build+import android.os.Environment+import android.provider.Settingsimport androidx.compose.animation.core.animateDpAsStateimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -47,6 +52,7 @@ import androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier+import androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.unit.dp@@ -61,11 +67,13 @@ fun SetupScreen(onSetupComplete: () -> Unit,viewModel: SetupViewModel = hiltViewModel(),) {+ val context = LocalContext.currentvar sliderPosition by remember { mutableFloatStateOf(0f) }var sshEnabled by remember { mutableStateOf(true) }+ var storageAccessEnabled by remember { mutableStateOf(false) }val selectedGb = storageSizes[sliderPosition.toInt().coerceIn(0, storageSizes.lastIndex)]val setupComplete by viewModel.setupComplete.collectAsStateWithLifecycle()- val pagerState = rememberPagerState(pageCount = { 2 })+ val pagerState = rememberPagerState(pageCount = { 3 })val scope = rememberCoroutineScope()LaunchedEffect(setupComplete) {@@ -80,7 +88,7 @@ fun SetupScreen() {// Step progress barLinearProgressIndicator(- progress = { (pagerState.currentPage + 1) / 2f },+ progress = { (pagerState.currentPage + 1) / 3f },modifier = Modifier.fillMaxWidth(),trackColor = MaterialTheme.colorScheme.surfaceVariant,)@@ -102,7 +110,40 @@ fun SetupScreen(sshEnabled = sshEnabled,onSshToggle = { sshEnabled = it },onBack = { scope.launch { pagerState.animateScrollToPage(0) } },- onGetStarted = { viewModel.completeSetup(selectedGb, sshEnabled) },+ onNext = { scope.launch { pagerState.animateScrollToPage(2) } },+ )+ 2 -> StorageAccessPage(+ storageAccessEnabled = storageAccessEnabled,+ onStorageAccessToggle = { enabled ->+ storageAccessEnabled = enabled+ if (enabled &&+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&+ !Environment.isExternalStorageManager()+ ) {+ context.startActivity(+ Intent(+ Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,+ Uri.parse("package:${context.packageName}"),+ )+ )+ }+ },+ onOpenStorageAccessSettings = {+ context.startActivity(+ Intent(+ Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,+ Uri.parse("package:${context.packageName}"),+ )+ )+ },+ onBack = { scope.launch { pagerState.animateScrollToPage(1) } },+ onGetStarted = {+ viewModel.completeSetup(+ storageSizeGb = selectedGb,+ sshEnabled = sshEnabled,+ storageAccessEnabled = storageAccessEnabled,+ )+ },)}}@@ -115,7 +156,7 @@ fun SetupScreen(horizontalArrangement = Arrangement.Center,verticalAlignment = Alignment.CenterVertically,) {- repeat(2) { index ->+ repeat(3) { index ->val isSelected = pagerState.currentPage == indexval dotWidth by animateDpAsState(targetValue = if (isSelected) 24.dp else 8.dp,@@ -282,7 +323,7 @@ private fun VmConfigPage(sshEnabled: Boolean,onSshToggle: (Boolean) -> Unit,onBack: () -> Unit,- onGetStarted: () -> Unit,+ onNext: () -> Unit,) {Column(modifier = Modifier.fillMaxSize(),@@ -404,7 +445,157 @@ private fun VmConfigPage(Spacer(Modifier.height(16.dp))}- // Fixed back + get started buttons+ // Fixed back + next buttons+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = 24.dp, vertical = 16.dp),+ horizontalArrangement = Arrangement.spacedBy(12.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ FilledTonalButton(+ onClick = onBack,+ modifier = Modifier+ .weight(1f)+ .height(56.dp),+ shape = RoundedCornerShape(16.dp),+ ) {+ Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)+ Spacer(Modifier.width(8.dp))+ Text("Back", style = MaterialTheme.typography.titleMedium)+ }+ Button(+ onClick = onNext,+ modifier = Modifier+ .weight(2f)+ .height(56.dp),+ shape = RoundedCornerShape(16.dp),+ ) {+ Text(+ "Next",+ style = MaterialTheme.typography.titleMedium,+ fontWeight = FontWeight.SemiBold,+ )+ Spacer(Modifier.width(8.dp))+ Icon(Icons.AutoMirrored.Filled.ArrowForward, contentDescription = null)+ }+ }+ }+}++@Composable+private fun StorageAccessPage(+ storageAccessEnabled: Boolean,+ onStorageAccessToggle: (Boolean) -> Unit,+ onOpenStorageAccessSettings: () -> Unit,+ onBack: () -> Unit,+ onGetStarted: () -> Unit,+) {+ val canManageAllFiles = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R+ val hasStoragePermission = !canManageAllFiles || Environment.isExternalStorageManager()++ Column(+ modifier = Modifier.fillMaxSize(),+ horizontalAlignment = Alignment.CenterHorizontally,+ ) {+ Column(+ modifier = Modifier+ .weight(1f)+ .verticalScroll(rememberScrollState())+ .padding(horizontal = 24.dp),+ horizontalAlignment = Alignment.CenterHorizontally,+ ) {+ Spacer(Modifier.height(40.dp))++ Icon(+ imageVector = Icons.Default.Security,+ contentDescription = null,+ modifier = Modifier.size(64.dp),+ tint = MaterialTheme.colorScheme.primary,+ )++ Spacer(Modifier.height(20.dp))++ Text(+ text = "Downloads Sharing",+ style = MaterialTheme.typography.headlineMedium,+ fontWeight = FontWeight.Bold,+ textAlign = TextAlign.Center,+ )++ Spacer(Modifier.height(8.dp))++ Text(+ text = "Optional access to your Downloads folder inside the VM.",+ style = MaterialTheme.typography.bodyLarge,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ textAlign = TextAlign.Center,+ )++ Spacer(Modifier.height(32.dp))++ Card(+ modifier = Modifier.fillMaxWidth(),+ shape = RoundedCornerShape(16.dp),+ colors = CardDefaults.cardColors(+ containerColor = MaterialTheme.colorScheme.surfaceVariant,+ ),+ ) {+ Column(modifier = Modifier.padding(20.dp)) {+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.SpaceBetween,+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Column(modifier = Modifier.weight(1f)) {+ Text(+ text = "Enable Downloads sharing",+ style = MaterialTheme.typography.titleMedium,+ fontWeight = FontWeight.SemiBold,+ )+ Spacer(Modifier.height(4.dp))+ Text(+ text = "Shares the Android Downloads folder with the VM over virtio-9p.",+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ }+ Spacer(Modifier.width(12.dp))+ Switch(+ checked = storageAccessEnabled,+ onCheckedChange = onStorageAccessToggle,+ )+ }++ Spacer(Modifier.height(16.dp))++ Text(+ text = "On some devices this may crash the VM.",+ style = MaterialTheme.typography.bodyMedium,+ color = MaterialTheme.colorScheme.error,+ fontWeight = FontWeight.SemiBold,+ )++ if (storageAccessEnabled && canManageAllFiles && !hasStoragePermission) {+ Spacer(Modifier.height(16.dp))+ Button(+ onClick = onOpenStorageAccessSettings,+ shape = RoundedCornerShape(12.dp),+ ) {+ Text("Grant storage access")+ }+ } else if (storageAccessEnabled && canManageAllFiles) {+ Spacer(Modifier.height(12.dp))+ Text(+ text = if (hasStoragePermission) "All files access granted." else "All files access not granted.",+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ }+ }+ }+ }+Row(modifier = Modifier.fillMaxWidth()diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.ktindex 80db247..31b7a05 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupViewModel.kt@@ -18,11 +18,12 @@ class SetupViewModel @Inject constructor(private val _setupComplete = MutableStateFlow(false)val setupComplete: StateFlow<Boolean> = _setupComplete.asStateFlow()- fun completeSetup(storageSizeGb: Int, sshEnabled: Boolean) {+ fun completeSetup(storageSizeGb: Int, sshEnabled: Boolean, storageAccessEnabled: Boolean) {viewModelScope.launch {// Write all settings fully before signalling completionsettingsRepository.setStorageSizeGb(storageSizeGb)settingsRepository.setSshEnabled(sshEnabled)+ settingsRepository.setStorageAccessEnabled(storageAccessEnabled)settingsRepository.markSetupDone()_setupComplete.value = true}diff --git a/app/src/main/jniLibs/arm64-v8a/libqemu-system-aarch64.so b/app/src/main/jniLibs/arm64-v8a/libqemu-system-aarch64.sodeleted file mode 100755index eeae199..0000000Binary files a/app/src/main/jniLibs/arm64-v8a/libqemu-system-aarch64.so and /dev/null differdiff --git a/app/src/main/jniLibs/arm64-v8a/libslirp.so b/app/src/main/jniLibs/arm64-v8a/libslirp.sodeleted file mode 100755index ea99cdf..0000000Binary files a/app/src/main/jniLibs/arm64-v8a/libslirp.so and /dev/null differdiff --git a/build-qemu-android.sh b/build-qemu-android.shindex 62546c5..957e267 100755--- a/build-qemu-android.sh+++ b/build-qemu-android.sh@@ -1,7 +1,7 @@#!/bin/bash# ─────────────────────────────────────────────────────────────────────────────# build-qemu-android.sh-# Builds QEMU 10.2.1 for Android ARM64 with virtfs support.+# Builds the configured QEMU version for Android ARM64 with virtfs support.# Replaces app/src/main/jniLibs/arm64-v8a/libqemu-system-aarch64.so# ─────────────────────────────────────────────────────────────────────────────set -euo pipefail@@ -9,13 +9,20 @@ set -euo pipefailSCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"IMAGE="podroid-qemu-builder"CONTAINER="podroid-qemu-extract"+QEMU_VERSION="$(grep -E '^podroidQemuVersion=' "${SCRIPT_DIR}/gradle.properties" | cut -d= -f2)"-echo "=== [1/4] Building QEMU 10.2.1 for Android ARM64 ==="+if [ -z "${QEMU_VERSION}" ]; then+ echo "ERROR: podroidQemuVersion is not set in gradle.properties" >&2+ exit 1+fi++echo "=== [1/4] Building QEMU ${QEMU_VERSION} for Android ARM64 ==="echo " This will take 20-40 minutes on first run."echo ""docker build \-f "${SCRIPT_DIR}/Dockerfile.qemu" \+ --build-arg "QEMU_VERSION=${QEMU_VERSION}" \-t "${IMAGE}" \"${SCRIPT_DIR}"@@ -54,9 +61,33 @@ readelf -d "${JNILIBS}/libqemu-system-aarch64.so" 2>/dev/null \| grep NEEDED | grep -oP '\[\K[^\]]+' | tr '\n' ' 'echo ""+echo -n " QEMU version: "+strings "${JNILIBS}/libqemu-system-aarch64.so" \+ | grep -m1 -oP 'QEMU emulator version \K.*' || echo "unknown"+echo -n " virtio-9p: "strings "${JNILIBS}/libqemu-system-aarch64.so" | grep -c "virtio-9p" || echo "0"+echo -n " 16KB pages: "+python3 - "${JNILIBS}/libqemu-system-aarch64.so" << 'EOF'+import struct, sys+path = sys.argv[1]+with open(path, 'rb') as f:+ data = f.read()+e_phoff = struct.unpack_from('<Q', data, 32)[0]+e_phentsize = struct.unpack_from('<H', data, 54)[0]+e_phnum = struct.unpack_from('<H', data, 56)[0]+aligns = []+for i in range(e_phnum):+ off = e_phoff + i * e_phentsize+ if struct.unpack_from('<I', data, off)[0] == 1:+ aligns.append(struct.unpack_from('<Q', data, off + 48)[0])+ok = all(a >= 16384 for a in aligns)+print("PASS" if ok else "FAIL")+if not ok:+ sys.exit(1)+EOF+echo ""echo "=== [4/4] Done! ==="echo ""diff --git a/gradle.properties b/gradle.propertiesindex 34c5e9e..4d7391e 100644--- a/gradle.properties+++ b/gradle.properties@@ -12,4 +12,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects# org.gradle.parallel=true# Kotlin code style for this project: "official" or "obsolete":-kotlin.code.style=official\ No newline at end of file+kotlin.code.style=official+podroidQemuVersion=11.0.0-rc2