mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 22:05:59 +00:00
Merge #570 (PowerVR + Xclipse system Vulkan) into the non-Adreno test branch
# Conflicts: # .github/workflows/build.yml # app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt # app/src/main/java/com/droiddeck/launcher/session/SessionService.kt # tools/build_local.sh # tools/dxvk/build.sh # tools/linuxfs/overlay/usr/local/bin/droiddeck-session # tools/release/runtime_inputs.py # tools/tests/test_runtime_inputs.py
This commit is contained in:
commit
56dc433673
104 files changed
+7206
-206
No files matched your search
@@ -1,6 +1,7 @@
|
||||
"""Attest prepared runtime inputs and reject stale local or CI APK payloads."""
|
||||
import hashlib
|
||||
import gzip
|
||||
import importlib.util
|
||||
import json
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
@@ -16,6 +17,7 @@ SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app
|
||||
'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio',
|
||||
'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env',
|
||||
'tools/mangoapp', 'tools/msitools', 'tools/comet', 'tools/build_local.sh',
|
||||
'tools/powervr', 'tools/hybris', 'tools/dxvk', 'tools/vulkan-wsi',
|
||||
'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal',
|
||||
'tools/quest', 'app/src/main/cpp/adrenotools/src/hook/kgsl.h',
|
||||
'app/src/main/assets/graphics_driver/adrenotools-turnip25.1.0.tzst']
|
||||
@@ -42,7 +44,7 @@ def sources(root):
|
||||
|
||||
def outputs(root):
|
||||
result = {}
|
||||
for tree in ['linuxfs', 'directaudio', 'droiddeck-esync', 'desktop-removal']:
|
||||
for tree in ['linuxfs', 'directaudio', 'droiddeck-esync', 'desktop-removal', 'hybris']:
|
||||
base = root / 'app/src/main/assets' / tree
|
||||
for path in base.rglob('*'):
|
||||
if path.is_file() and not any(part.startswith('.') for part in path.relative_to(base).parts):
|
||||
@@ -67,6 +69,8 @@ def required():
|
||||
paths += ['assets/linuxfs/i386/libfaultreport.so']
|
||||
paths += ['assets/linuxfs/usr/local/lib/droiddeck-msitools/' + name for name in
|
||||
['msiinfo', 'cabextract', '7z', '7z.so', 'libmsi-1.0.so.0', 'libgsf-1.so.114', 'libgcab-1.0.so.0']]
|
||||
paths += ['assets/linuxfs/usr/local/lib/droiddeck-xclipse/' + name for name in
|
||||
['libVkLayer_droiddeck_xclipse.so', 'VkLayer_droiddeck_xclipse.json']]
|
||||
paths += ['assets/linuxfs/usr/local/lib/mangoapp/' + name for name in
|
||||
['mangoapp', 'libfmt.so.10', 'libspdlog.so.1.13', 'libglfw.so.3', 'libtraceevent.so.1', 'libtracefs.so.1']]
|
||||
paths += ['assets/linuxfs/usr/local/lib/droiddeck-comet/' + name for name in
|
||||
@@ -81,9 +85,17 @@ def required():
|
||||
paths += ['assets/desktop-removal/' + name for name in
|
||||
['lxqt-r1.tsv.gzip', 'kde-remove.tsv.gzip', 'kde-keep.txt.gzip',
|
||||
'emulators-keep.txt.gzip', 'versions.txt', 'sources.json']]
|
||||
paths += ['assets/hybris/runtime.tzst', 'assets/hybris/version.txt']
|
||||
return paths
|
||||
|
||||
|
||||
def verify_powervr(root):
|
||||
spec = importlib.util.spec_from_file_location('powervr_fetch', ROOT / 'tools/powervr/fetch.py')
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
module.verify(root)
|
||||
|
||||
|
||||
def record(root=ROOT):
|
||||
# Refresh scripts even on a CI native-cache hit; these are source, not cached binaries.
|
||||
if root == ROOT:
|
||||
@@ -96,6 +108,7 @@ def record(root=ROOT):
|
||||
missing = [name for name in required() if name not in paths or not (root / paths[name]).is_file()]
|
||||
if missing:
|
||||
raise ValueError('Missing runtime inputs:\n' + '\n'.join(missing))
|
||||
verify_powervr(root)
|
||||
for name, path in paths.items():
|
||||
if name.startswith('assets/desktop-removal/') and name.endswith('.gzip'):
|
||||
try:
|
||||
|
||||
Reference in new issue
Block a user