mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
13 conflicts, resolved as: - build.yml: both checkout steps keep the MaliBridge submodule and take main's sparse checkout. - SessionActivity: main moved the session drawer into SessionMenu(); its DrawerActions get the test branch's systemPowerVr line, the only test-branch change in that call. - TurnipDriver: the Mali check stays first, then main's injected detector (non-Adreno: system driver). - BwrapSpawner: the bridge ICD check stays first, then main's runtimeLib() lookup (Ubuntu 26.04 paths). - SessionArtifacts.finishAbandoned: main's beforeGuestStart flow and recovery markers, plus the test branch's Android exit reasons in the recovery note and the low-memory notice (returns Boolean); main's in-loop return becomes break so the notice is still left. - SessionService: pruneSystemVulkanRuntime() kept before main's finishSessionStop(..., collectEnded). - strings.xml, test_game_environment.py: both sides' additions. - build_local.sh, test_local.sh: main's docker_platform.sh; local-cross.Dockerfile: main's arm64-aware layout plus libvulkan-dev, image tag 24.04-v4. - gamescope/release.env: the p23-nonadreno pin stays until this round's gamescope build. - check_session_assets.py: the test branch's pattern (any usr/ target) covers main's. Workflow step names checked: none lost from either side.
15 lines
489 B
Docker
15 lines
489 B
Docker
FROM ubuntu:24.04
|
|
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y binutils gcc g++ libvulkan-dev python3 zstd unzip \
|
|
&& if [ "$(uname -m)" = aarch64 ]; then \
|
|
for tool in gcc g++ strip readelf objdump ar; do ln -s "$(command -v $tool)" /usr/local/bin/aarch64-linux-gnu-$tool; done; \
|
|
else \
|
|
apt-get install -y binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu; \
|
|
fi \
|
|
&& mkdir -p /src
|
|
|
|
WORKDIR /src
|