From d05f895ccfadb9aa7ae9fd0a7ca29562c6961b4e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 9 Nov 2026 12:26:36 -0500 Subject: [PATCH] build(native): the hook is built with its Go support and tracked by the preload recipe --- tools/components/recipes.json | 12 ++++++++---- tools/nativeguest/build.sh | 6 +++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/components/recipes.json b/tools/components/recipes.json index b5789aa7e..92fcc548a 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -164,7 +164,8 @@ "tools/components/build-arm64-preloads.sh", "tools/linuxfs/preload", "app/src/main/cpp/fakeinput_steam.cpp", - "tools/components/recipes/arm64-preloads.sh" + "tools/components/recipes/arm64-preloads.sh", + "tools/nativeguest" ], "outputs": [ "app/src/main/assets/linuxfs/libfakeinput.so", @@ -172,7 +173,8 @@ "app/src/main/assets/linuxfs/libblfastpath.so", "app/src/main/assets/linuxfs/libblaudit.so", "app/src/main/assets/linuxfs/libssbs.so", - "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard" + "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-clipboard", + "app/src/main/assets/linuxfs/libddnatv-hook.so" ], "packages": [ "gcc-aarch64-linux-gnu", @@ -187,7 +189,8 @@ "tools/quest/kgsl_compat.h", "tools/proot/fastpath", "tools/linuxfs/ssbs", - "tools/linuxfs/clipboard" + "tools/linuxfs/clipboard", + "tools/nativeguest" ], "snapshot_outputs": [ "libfakeinput.so", @@ -195,7 +198,8 @@ "libblfastpath.so", "libblaudit.so", "libssbs.so", - "usr/local/bin/droiddeck-clipboard" + "usr/local/bin/droiddeck-clipboard", + "libddnatv-hook.so" ] }, "preload-snapshot": { diff --git a/tools/nativeguest/build.sh b/tools/nativeguest/build.sh index 057e5619b..46002f248 100755 --- a/tools/nativeguest/build.sh +++ b/tools/nativeguest/build.sh @@ -5,7 +5,11 @@ set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) out=${1:?output path} cc=${2:-aarch64-linux-gnu-gcc} +gen=$(mktemp -d) +trap 'rm -rf "$gen"' EXIT +mkdir -p "$gen/gosys" +bash "$here/build-gosys.sh" "$gen/gosys/gosys_blob.h" "$cc" -std=gnu11 -shared -fPIC -O2 -fno-delete-null-pointer-checks -Wall -Wno-nonnull-compare \ - -Wno-format-truncation -Wno-stringop-truncation -Wl,-z,max-page-size=16384 \ + -Wno-format-truncation -Wno-stringop-truncation -Wl,-z,max-page-size=16384 -I "$gen" \ -o "$out" "$here/ddnatv-hook.c" -ldl "${cc%gcc}strip" --strip-unneeded "$out"