mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +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.
12 lines
646 B
Bash
12 lines
646 B
Bash
# Sourced by the build scripts: picks the Docker platform and the matching cross-build image.
|
|
docker_platform=${DROIDDECK_DOCKER_PLATFORM:-}
|
|
if [[ -z "${docker_platform}" ]]; then
|
|
case "$(uname -m)" in arm64|aarch64) docker_platform=linux/arm64 ;; *) docker_platform=linux/amd64 ;; esac
|
|
fi
|
|
case "${docker_platform}" in linux/arm64|linux/arm64/*) docker_platform=linux/arm64 ;; esac
|
|
if [[ -z "${DROIDDECK_BUILD_IMAGE:-}" ]]; then
|
|
DROIDDECK_BUILD_IMAGE=droiddeck-local-cross:24.04-v4
|
|
[[ "${docker_platform}" == linux/arm64 ]] && DROIDDECK_BUILD_IMAGE+=-arm64
|
|
fi
|
|
export DROIDDECK_DOCKER_PLATFORM=${docker_platform} DROIDDECK_BUILD_IMAGE
|