diff --git a/tools/build_local.sh b/tools/build_local.sh index 425199741..d90a458d2 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -171,12 +171,20 @@ x86_key=$(inputs_hash bullseye tools/linuxfs/build-x86-preloads.sh tools/linuxfs app/src/main/cpp/fakeinput_steam.cpp) x86_stage="${staging_dir}/x86-preloads" if restore_step x86-preloads "${x86_key}" "${linuxfs_dir}"; then :; else - docker run --rm --platform linux/amd64 \ + x86_platform=linux/amd64 + x86_packages="gcc g++ gcc-multilib g++-multilib binutils" + x86_cross=0 + if [[ "${docker_platform}" == linux/arm64 ]]; then + x86_platform=linux/arm64 + x86_packages="gcc-x86-64-linux-gnu g++-x86-64-linux-gnu gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-amd64-cross libc6-dev-i386-cross binutils-x86-64-linux-gnu binutils-i686-linux-gnu" + x86_cross=1 + fi + docker run --rm --platform "${x86_platform}" -e X86_CROSS="${x86_cross}" -e X86_PACKAGES="${x86_packages}" \ -v "${repo_root}:/src" -v "${git_common}:${git_common}" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' set -euo pipefail printf "deb http://archive.debian.org/debian bullseye main\ndeb http://archive.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list apt-get -o Acquire::Check-Valid-Until=false update -qq - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends gcc g++ gcc-multilib g++-multilib binutils >/dev/null + DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends $X86_PACKAGES >/dev/null tools/linuxfs/build-x86-preloads.sh app/src/main/assets/linuxfs chown -R '"$(id -u):$(id -g)"' app/src/main/assets/linuxfs ' @@ -436,8 +444,12 @@ if [[ "${DROIDDECK_SKIP_RUST:-0}" != 1 ]]; then rockstar_out="${linuxfs_dir}/usr/local/lib/droiddeck-rockstar" rockstar_key=$(inputs_hash "windows-gnu" tools/rockstar-launcher/src tools/rockstar-launcher/Cargo.toml tools/rockstar-launcher/Cargo.lock tools/rockstar-launcher/build.sh) if ! restore_step rockstar "${rockstar_key}" "${rockstar_out}"; then - command -v i686-w64-mingw32-gcc >/dev/null 2>&1 || { echo "i686-w64-mingw32-gcc is required for the Rockstar launcher service." >&2; exit 1; } - CARGO_TARGET_DIR="${cache_dir}/rockstar-target" bash tools/rockstar-launcher/build.sh "${rockstar_out}" + if [[ "$(uname -s)" == Darwin ]]; then + bash tools/rockstar-launcher/build-container.sh "${rockstar_out}" + else + command -v i686-w64-mingw32-gcc >/dev/null 2>&1 || { echo "i686-w64-mingw32-gcc is required for the Rockstar launcher service." >&2; exit 1; } + CARGO_TARGET_DIR="${cache_dir}/rockstar-target" bash tools/rockstar-launcher/build.sh "${rockstar_out}" + fi save_step rockstar "${rockstar_key}" "${rockstar_out}" fi epic_out="${linuxfs_dir}/usr/local/lib/droiddeck-epic" @@ -473,7 +485,7 @@ readelf_path=$(find "${NDK}/toolchains/llvm/prebuilt" -name llvm-readelf | head [[ -x "${readelf_path}" ]] || { echo "NDK llvm-readelf is missing" >&2; exit 1; } stores_check=() [[ "${DROIDDECK_SKIP_RUST:-0}" != 1 ]] || stores_check+=(--without-stores) -python3 tools/release/check_android_libraries.py "${apk}" --readelf "${readelf_path}" "${stores_check[@]}" +python3 tools/release/check_android_libraries.py "${apk}" --readelf "${readelf_path}" ${stores_check[@]+"${stores_check[@]}"} git diff --exit-code -- app/src/main/rust/stores/Cargo.lock build_tools=$(find "${sdk_dir}/build-tools" -mindepth 1 -maxdepth 1 -type d -print | sort -V | tail -1) diff --git a/tools/linuxfs/build-x86-preloads.sh b/tools/linuxfs/build-x86-preloads.sh index a9c32a18d..ccb00eeab 100755 --- a/tools/linuxfs/build-x86-preloads.sh +++ b/tools/linuxfs/build-x86-preloads.sh @@ -1,26 +1,34 @@ #!/bin/sh set -eu out=${1:?usage: build-x86-preloads.sh } +tools() { + prefix= + if [ "${X86_CROSS:-}" = 1 ]; then + case $1 in i386) prefix=i686-linux-gnu- ;; *) prefix=x86_64-linux-gnu- ;; esac + fi + GCC=${prefix}gcc GXX=${prefix}g++ STRIP=${prefix}strip OBJDUMP=${prefix}objdump NM=${prefix}nm +} for arch in x86_64 i386; do + tools $arch case $arch in x86_64) bits=-m64 ;; i386) bits=-m32 ;; esac mkdir -p "$out/$arch" - gcc $bits -shared -fPIC -O2 -Wall -pthread \ + $GCC $bits -shared -fPIC -O2 -Wall -pthread \ -o "$out/$arch/libddsession.so" tools/linuxfs/preload/*.c -ldl - g++ $bits -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ + $GXX $bits -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ -pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \ -o "$out/$arch/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl - strip --strip-unneeded "$out/$arch/libddsession.so" "$out/$arch/libfakeinput.so" + $STRIP --strip-unneeded "$out/$arch/libddsession.so" "$out/$arch/libfakeinput.so" for lib in "$out/$arch/libddsession.so" "$out/$arch/libfakeinput.so"; do - newest=$(objdump -T "$lib" | grep -o 'GLIBC_2\.[0-9]*' | sort -u -t. -k2,2n | tail -1) + newest=$($OBJDUMP -T "$lib" | grep -o 'GLIBC_2\.[0-9]*' | sort -u -t. -k2,2n | tail -1) minor=${newest#GLIBC_2.} if [ "$minor" -gt 31 ]; then echo "$lib needs $newest; Steam Linux Runtime 3.0 has glibc 2.31" >&2 exit 1 fi - if objdump -p "$lib" | grep -q 'NEEDED.*lib\(stdc++\|gcc_s\)'; then + if $OBJDUMP -p "$lib" | grep -q 'NEEDED.*lib\(stdc++\|gcc_s\)'; then echo "$lib links the C++ runtime dynamically" >&2 exit 1 fi @@ -28,37 +36,39 @@ for arch in x86_64 i386; do done for target in x86_64/faultreport i386/faultreport; do arch=${target%/*} name=${target#*/} + tools $arch case $arch in x86_64) bits=-m64 ;; i386) bits=-m32 ;; esac lib=$out/$arch/lib$name.so - gcc $bits -shared -fPIC -O2 -Wall -Wextra -nostdlib -fno-stack-protector -fno-builtin -fvisibility=hidden \ + $GCC $bits -shared -fPIC -O2 -Wall -Wextra -nostdlib -fno-stack-protector -fno-builtin -fvisibility=hidden \ -o "$lib" tools/linuxfs/fex/$name.c - strip --strip-unneeded "$lib" - if objdump -p "$lib" | grep -q NEEDED || [ -n "$(nm -D --undefined-only "$lib" 2>/dev/null)" ]; then + $STRIP --strip-unneeded "$lib" + if $OBJDUMP -p "$lib" | grep -q NEEDED || [ -n "$($NM -D --undefined-only "$lib" 2>/dev/null)" ]; then echo "$lib must not need any library" >&2 exit 1 fi done +tools x86_64 lib=$out/x86_64/libwebkitinput.so -gcc -m64 -shared -fPIC -O2 -Wall -Wextra -nostdlib -fno-stack-protector -fno-builtin -fvisibility=hidden \ +$GCC -m64 -shared -fPIC -O2 -Wall -Wextra -nostdlib -fno-stack-protector -fno-builtin -fvisibility=hidden \ -o "$lib" tools/linuxfs/fex/webkitinput.c -strip --strip-unneeded "$lib" -if objdump -p "$lib" | grep -q NEEDED || [ "$(nm -D --undefined-only "$lib" | awk '{print $1 $2}' | LC_ALL=C sort | tr '\n' ' ')" != "wdlsym wg_getenv wg_object_get_data wg_object_set wg_object_set_data wg_type_check_instance_is_a wgtk_container_forall wgtk_container_get_type wgtk_key_snooper_install wgtk_widget_get_toplevel wwebkit_user_script_new wwebkit_user_script_unref wwebkit_web_view_get_type wwebkit_web_view_get_uri wwebkit_web_view_run_javascript " ]; then +$STRIP --strip-unneeded "$lib" +if $OBJDUMP -p "$lib" | grep -q NEEDED || [ "$($NM -D --undefined-only "$lib" | awk '{print $1 $2}' | LC_ALL=C sort | tr '\n' ' ')" != "wdlsym wg_getenv wg_object_get_data wg_object_set wg_object_set_data wg_type_check_instance_is_a wgtk_container_forall wgtk_container_get_type wgtk_key_snooper_install wgtk_widget_get_toplevel wwebkit_user_script_new wwebkit_user_script_unref wwebkit_web_view_get_type wwebkit_web_view_get_uri wwebkit_web_view_run_javascript " ]; then echo "$lib must need nothing but weak GLib, GTK and WebKit calls" >&2 exit 1 fi stub=$(mktemp -d) -gcc -m64 -shared -nostdlib -Wl,-soname,/usr/lib/x86_64-linux-gnu/libvulkan.so.1 -o "$stub/libvulkan.so.1" -x c /dev/null +$GCC -m64 -shared -nostdlib -Wl,-soname,/usr/lib/x86_64-linux-gnu/libvulkan.so.1 -o "$stub/libvulkan.so.1" -x c /dev/null lib=$out/x86_64/libvulkan-thunk.so -gcc -m64 -shared -fPIC -O2 -Wall -Wextra -fvisibility=hidden -Wl,-soname,libvulkan.so.1 -Wl,-z,nodelete -Wl,--no-as-needed \ +$GCC -m64 -shared -fPIC -O2 -Wall -Wextra -fvisibility=hidden -Wl,-soname,libvulkan.so.1 -Wl,-z,nodelete -Wl,--no-as-needed \ -o "$lib" tools/linuxfs/fex/vulkanpin.c "$stub/libvulkan.so.1" -ldl rm -rf "$stub" -strip --strip-unneeded "$lib" -newest=$(objdump -T "$lib" | grep -o 'GLIBC_2\.[0-9]*' | sort -u -t. -k2,2n | tail -1) -if ! objdump -p "$lib" | grep -q 'NEEDED *\/usr/lib/x86_64-linux-gnu/libvulkan\.so\.1$' \ - || ! objdump -p "$lib" | grep -q 'FLAGS_1 *0x0*8$' || [ "${newest#GLIBC_2.}" -gt 31 ]; then +$STRIP --strip-unneeded "$lib" +newest=$($OBJDUMP -T "$lib" | grep -o 'GLIBC_2\.[0-9]*' | sort -u -t. -k2,2n | tail -1) +if ! $OBJDUMP -p "$lib" | grep -q 'NEEDED *\/usr/lib/x86_64-linux-gnu/libvulkan\.so\.1$' \ + || ! $OBJDUMP -p "$lib" | grep -q 'FLAGS_1 *0x0*8$' || [ "${newest#GLIBC_2.}" -gt 31 ]; then echo "$lib must be nodelete, need the Vulkan thunk and run on glibc 2.31" >&2 exit 1 fi diff --git a/tools/rockstar-launcher/build-container.sh b/tools/rockstar-launcher/build-container.sh new file mode 100755 index 000000000..bee7c4877 --- /dev/null +++ b/tools/rockstar-launcher/build-container.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# Builds the Rockstar launcher in a container, on the host's own architecture. Rust's +# i686-pc-windows-gnu target needs a DWARF2 mingw; Homebrew's i686 mingw uses SJLJ and fails to link. +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +repo=$(cd "$here/../.." && pwd) +out=${1:?usage: build-container.sh } +. "$repo/tools/docker_platform.sh" +cache=${DROIDDECK_BUILD_CACHE:-$HOME/.cache/droiddeck-build}/rockstar-container +mkdir -p "$out" "$cache/cargo" "$cache/target" +out=$(cd "$out" && pwd) +image=droiddeck-rockstar-build:v2-${docker_platform#linux/} + +if ! docker image inspect "$image" >/dev/null 2>&1; then + docker build --platform "$docker_platform" -t "$image" - <<'EOF' +FROM public.ecr.aws/docker/library/ubuntu:24.04 +ENV DEBIAN_FRONTEND=noninteractive RUSTUP_HOME=/opt/rustup CARGO_HOME=/opt/cargo PATH=/opt/cargo/bin:$PATH +RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends ca-certificates curl gcc libc6-dev \ + gcc-mingw-w64-i686-posix gcc-mingw-w64-x86-64-posix >/dev/null +RUN curl -sSf https://sh.rustup.rs | sh -s -- -y -q --profile minimal --default-toolchain stable \ + -t i686-pc-windows-gnu -t x86_64-pc-windows-gnu && chmod -R a+rX /opt/rustup /opt/cargo +EOF +fi + +docker run --rm --platform "$docker_platform" --user "$(id -u):$(id -g)" \ + -e CARGO_HOME=/cache/cargo -e CARGO_TARGET_DIR=/cache/target -e HOME=/tmp \ + -v "$repo:/src" -v "$out:/out" -v "$cache:/cache" -w /src "$image" \ + bash tools/rockstar-launcher/build.sh /out diff --git a/tools/vr/build.sh b/tools/vr/build.sh index f28ef326b..4e9fb12b9 100755 --- a/tools/vr/build.sh +++ b/tools/vr/build.sh @@ -14,7 +14,7 @@ if [ -z "$vkinc" ]; then for ndk in "${ANDROID_NDK_HOME:-}" "${ANDROID_NDK_LATEST_HOME:-}" \ $(ls -d "${ANDROID_HOME:-$HOME/Library/Android/sdk}"/ndk/* 2>/dev/null | sort -r); do [ -n "$ndk" ] || continue - cand=$(ls -d "$ndk"/toolchains/llvm/prebuilt/*/sysroot/usr/include 2>/dev/null | head -1) + cand=$(ls -d "$ndk"/toolchains/llvm/prebuilt/*/sysroot/usr/include 2>/dev/null | head -1 || true) if [ -n "$cand" ] && [ -f "$cand/vulkan/vk_layer.h" ]; then vkinc=$cand; break; fi done fi