i#2154 Android64: Fix write syscall in nolibc_print()

Current versions of Android make the FILE struct opaque so we can't access its members to get the file descriptor for stderr. Instead we can use STDERR_FILENO from unistd.h. Issue: #1874, #2154
DynamoRIO · Jan 15, 2025 · 6386b83 · 6386b83
1 parent 51ccee3
commit 6386b83
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/suite/tests/tools.c b/suite/tests/tools.c
@@ -379,8 +379,10 @@ nolibc_print(const char *str)
         SYS_write,
 #        endif
         3,
-#        if defined(MACOS) || defined(ANDROID)
+#        if defined(MACOS)
         stderr->_file,
+#        elif defined(ANDROID)
+        STDERR_FILENO,
 #        else
         stderr->_fileno,
 #        endif