feat: the PowerVR runtime is a downloaded add-on pack, not bundled in the APK (#2157)

* feat: the PowerVR runtime is a downloaded add-on pack, not bundled in the APK

* fix: a stopped session cancels the PowerVR pack download

* fix: a session stopped during runtime unpacking ends before staging

* fix: a failed PowerVR pack download ends the session with a message
This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-11-05 22:58:10 -05:00
1 parent 3733c50902
commit 4cbd7722f8
43 files changed
+77 -13

No files matched your search

+1
View File
@@ -76,6 +76,7 @@ pack tracking "$work/tracking" hand_landmarker.task hand_landmarker_lite.task po
libopencv_java4.so libmediapipe_tasks_jni.so
pack xbox "$linuxfs/droiddeck-xbox" version xodus-cli xodus-service
pack comet "$linuxfs/droiddeck-comet" version comet
pack powervr "$repo/app/src/main/assets/hybris" runtime.tzst version.txt
mkdir "$work/butler"
fetch "https://broth.itch.zone/butler/linux-arm64/${BUTLER_VERSION}/archive/default" \
+4 -3
View File
@@ -51,9 +51,10 @@ def check(apk, overlay=OVERLAY):
runtime = importlib.util.module_from_spec(spec)
spec.loader.exec_module(runtime)
try:
runtime.verify_archive(package.read('assets/hybris/runtime.tzst'),
package.read('assets/hybris/version.txt').decode('ascii'))
except (KeyError, ValueError, OSError) as error:
bundle = OVERLAY.parents[2] / 'app/src/main/assets/hybris'
runtime.verify_archive((bundle / 'runtime.tzst').read_bytes(),
(bundle / 'version.txt').read_text('ascii'))
except (ValueError, OSError) as error:
errors.append('invalid PowerVR runtime: ' + str(error))
return errors
+2 -2
View File
@@ -14,11 +14,11 @@ ROOT = Path(__file__).resolve().parents[2]
MANIFEST = Path('app/build/runtime-inputs.json')
PACKS = Path('app/build/packs')
PACKED = {'assets/linuxfs/usr/local/lib/droiddeck-xbox/': 'xbox', 'assets/linuxfs/usr/local/lib/droiddeck-comet/': 'comet',
'assets/directaudio/': 'directaudio'}
'assets/directaudio/': 'directaudio', 'assets/hybris/': 'powervr'}
PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'),
'lib/arm64-v8a/libproot-loader.so': ('proot', 'libproot-loader.so')}
PACKED_LIBRARIES = ['lib/arm64-v8a/libopencv_java4.so', 'lib/arm64-v8a/libmediapipe_tasks_jni.so']
PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler']
PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr']
SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst',
'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs',
'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env',
+5
View File
@@ -179,6 +179,11 @@ class RuntimeInputsTest(unittest.TestCase):
with self.assertRaisesRegex(ValueError, 'xbox pack provides'):
runtime.check_apk(apk, self.root)
def test_an_apk_still_carrying_the_powervr_runtime_is_rejected(self):
apk = self.current_apk(self.root / 'bundled.apk', {'assets/hybris/runtime.tzst': b'runtime'})
with self.assertRaisesRegex(ValueError, 'powervr pack provides'):
runtime.check_apk(apk, self.root)
def test_an_apk_still_carrying_tracking_libraries_is_rejected(self):
apk = self.current_apk(self.root / 'bundled.apk', {runtime.PACKED_LIBRARIES[0]: b'library'})
with self.assertRaisesRegex(ValueError, 'tracking pack provides'):