From 6a15aff789fa12fa538ccbaedaff9f97fa986de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 13 Oct 2026 12:54:09 +0200 Subject: [PATCH] Android.mk: Don't link the adrenotools hook libraries into ppsspp_common They are meant to be separate shared libraries that driver.cpp loads into the driver's namespace by name (ext/libadrenotools builds them that way, and so does the gradle build). Linked into an executable, file_redirect_hook.c's global fopen() takes over every fopen in the process, including the one in libc's own startup, and hook_fopen() calls fopen() again forever. That hung ppsspp_headless (and the unit test executable) before main(). Co-Authored-By: Claude Opus 5.5 --- android/jni/Android.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index e6cb709ae5..e5931fba84 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -280,10 +280,6 @@ RCHEEVOS_FILES := \ ifeq ($(TARGET_ARCH_ABI),arm64-v8a) ADRENOTOOLS_FILES := \ ${SRC}/ext/libadrenotools/src/driver.cpp \ - ${SRC}/ext/libadrenotools/src/hook/hook_impl.cpp \ - ${SRC}/ext/libadrenotools/src/hook/file_redirect_hook.c \ - ${SRC}/ext/libadrenotools/src/hook/gsl_alloc_hook.c \ - ${SRC}/ext/libadrenotools/src/hook/main_hook.c \ ${SRC}/ext/libadrenotools/lib/linkernsbypass/android_linker_ns.cpp \ ${SRC}/ext/libadrenotools/lib/linkernsbypass/elf_soname_patcher.cpp endif