From a2fa72eb741be42ae313d988169861fcc85160c5 Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Sat, 24 Oct 2026 02:00:57 +0900 Subject: [PATCH] Require full runtime assets and verify every packaged APK (cherry picked from commit 75c62ddd92000e31a96d9acbd9599cb07c7041ed) --- AGENTS.md | 1 + app/build.gradle | 25 +++++++++++++++++++- tools/release/runtime_inputs.py | 38 ++++++++++++++++++++++++++++-- tools/tests/test_runtime_inputs.py | 14 +++++++++++ 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index c22c5647c..af534d990 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,3 +1,4 @@ # Rules - Comments should be rare, factual, and explain only non-obvious external constraints or business invariants. +- Always compile APKs with the prepared Linux runtime assets and valid add-on pack checksums so a fresh installation on another phone can install the runtime. Never use `reuseInstalledRuntime` or rely on runtime files already installed on a connected device. Run APK runtime-input verification before sharing a build. diff --git a/app/build.gradle b/app/build.gradle index 1b1eb5ae7..d6ddb68cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -79,6 +79,7 @@ def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getO ?: providers.environmentVariable('GITHUB_SHA').getOrNull() ?: gitValue(['rev-parse', 'HEAD']) ?: '' def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' } def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' +if (project.hasProperty('reuseInstalledRuntime')) throw new GradleException('All APKs require prepared Linux runtime packages; runtime reuse is not allowed') def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() def commitTime = (gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit]) ?: '0').with { it.isLong() ? it : '0' } def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines() @@ -254,6 +255,16 @@ def stageSessionScripts = tasks.register('stageSessionScripts', Copy) { from(rootProject.file('tools/linuxfs/overlay')) { include 'usr/local/bin/droiddeck-*', 'usr/local/bin/steam-compatibility', 'usr/bin/**' } + from(rootProject.file('tools/linuxfs/desktop')) { + include 'droiddeck-gpu', 'droiddeck-desktop', 'droiddeck-desktop-gpu', 'kwin_wayland_wrapper' + into 'usr/local/bin' + } + from(rootProject.file('tools/linuxfs/desktop/firefox-droiddeck.js')) { + into 'usr/lib/firefox/defaults/pref' + rename { 'droiddeck.js' } + } + from(rootProject.file('tools/linuxfs/desktop/droiddeck-clipboard.desktop')) { into 'etc/xdg/autostart' } + from(rootProject.file('tools/mangoapp/mangoapp')) { into 'usr/local/bin' } into(layout.projectDirectory.dir('src/main/assets/linuxfs')) } tasks.named('preBuild').configure { dependsOn(stageSessionScripts) } @@ -283,7 +294,19 @@ def verifyRuntimeInputs = tasks.register('verifyRuntimeInputs', Exec) { commandLine pythonExecutable, 'tools/release/runtime_inputs.py', 'verify' } tasks.configureEach { task -> - if (task.name in ['packageDebug', 'packageRelease']) task.dependsOn(verifyRuntimeInputs) + if (task.name == 'packageRelease') { + task.dependsOn(verifyRuntimeInputs) + } + if (task.name == 'packageDebug') task.dependsOn(verifyRuntimeInputs) +} + +['Debug', 'Release'].each { variant -> + def verifyApk = tasks.register("verify${variant}PackagedRuntime", Exec) { + workingDir rootProject.projectDir + commandLine pythonExecutable, 'tools/release/runtime_inputs.py', 'apk', + layout.buildDirectory.file("outputs/apk/${variant.toLowerCase()}/app-${variant.toLowerCase()}.apk").get().asFile.absolutePath + } + tasks.matching { it.name == "assemble${variant}" }.configureEach { finalizedBy(verifyApk) } } def rustCrateDir = layout.projectDirectory.dir('src/main/rust/stores') diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index ccce1f0f0..074a1277f 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -33,6 +33,16 @@ SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app 'app/src/main/assets/graphics_driver/adrenotools-turnip25.1.0.tzst'] +def zstd(): + executable = shutil.which('zstd') + if executable: + return executable + windows_tool = ROOT / 'build/windows-setup/tools/zstd/zstd.exe' + if windows_tool.is_file(): + return str(windows_tool) + raise ValueError('zstd is required to verify Linux runtime packages') + + def digest(path): with path.open('rb') as source: result = hashlib.file_digest(source, 'sha256') if hasattr(hashlib, 'file_digest') else None @@ -132,7 +142,7 @@ def record(root=ROOT): gzip.decompress((root / path).read_bytes()) except (OSError, EOFError) as error: raise ValueError('Invalid desktop removal inventory: ' + name) from error - process = subprocess.Popen(['zstd', '-dc', str(root / paths['assets/pulseaudio.tzst'])], stdout=subprocess.PIPE) + process = subprocess.Popen([zstd(), '-dc', str(root / paths['assets/pulseaudio.tzst'])], stdout=subprocess.PIPE) try: with tarfile.open(fileobj=process.stdout, mode='r|') as archive: names = {member.name.removeprefix('./') for member in archive} @@ -171,7 +181,7 @@ def pack_digests(root, name): path = root / PACKS / (name + '.tar.zst') if not path.is_file(): raise ValueError('Missing add-on pack ' + name + '. Run tools/packs/build.sh app/build/packs.') - process = subprocess.Popen(['zstd', '-dc', str(path)], stdout=subprocess.PIPE) + process = subprocess.Popen([zstd(), '-dc', str(path)], stdout=subprocess.PIPE) digests = {} try: with tarfile.open(fileobj=process.stdout, mode='r|') as archive: @@ -185,6 +195,23 @@ def pack_digests(root, name): return digests +def qualcomm_assets(root): + path = root / 'tools/qualcomm/runtime.json' + if not path.is_file(): + return {} + lock = json.loads(path.read_text()) + expected = {'assets/qualcomm/runtime.tzst': lock['sha256'], + 'assets/qualcomm/gamescope': lock['gamescope']['member_sha256']} + built = lock['gamescope'].get('build') + if built: + expected['assets/qualcomm/licenses/gamescope-patched-source.tar.gzip'] = built['source_sha256'] + expected.update({'assets/qualcomm/mesa/' + entry['path']: entry['sha256'] + for entry in lock.get('mesa', {}).get('files', [])}) + expected.update({'assets/qualcomm/' + entry['path']: entry['sha256'] + for entry in lock.get('wsi', {}).get('files', [])}) + return expected + + def check_apk(apk, root=ROOT): data = verify(root) packs = {name: pack_digests(root, name) for name in PACK_NAMES} @@ -216,6 +243,13 @@ def check_apk(apk, root=ROOT): raise ValueError('APK missing ' + name) if hashlib.sha256(content).hexdigest() != output['sha256']: raise ValueError('APK has stale runtime input: ' + name) + for name, checksum in qualcomm_assets(root).items(): + try: + content = package.read(name) + except KeyError: + raise ValueError('APK missing ' + name) + if hashlib.sha256(content).hexdigest() != checksum: + raise ValueError('APK has stale Qualcomm runtime input: ' + name) if __name__ == '__main__': diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index e368290e3..3de2b91e8 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -1,6 +1,8 @@ import importlib.util import gzip +import hashlib import io +import json from pathlib import Path, PureWindowsPath import subprocess import tarfile @@ -209,3 +211,15 @@ class RuntimeInputsTest(unittest.TestCase): path.write_bytes(b'not a gzip stream') with self.assertRaisesRegex(ValueError, 'Invalid desktop removal inventory'): runtime.record(self.root) + + def test_stale_qualcomm_binary_is_rejected(self): + bridge, binary = b'bridge', b'new gamescope' + lock = self.root / 'tools/qualcomm/runtime.json' + lock.parent.mkdir(parents=True) + lock.write_text(json.dumps({'sha256': hashlib.sha256(bridge).hexdigest(), + 'gamescope': {'member_sha256': hashlib.sha256(binary).hexdigest()}})) + apk = self.current_apk(self.root / 'qualcomm.apk', { + 'assets/qualcomm/runtime.tzst': bridge, + 'assets/qualcomm/gamescope': b'old gamescope'}) + with self.assertRaisesRegex(ValueError, 'stale Qualcomm runtime input'): + runtime.check_apk(apk, self.root)