From a94f2ad2b7b3d9c527d9b589d6200cca3b11d413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Jos=C3=A9=20Arboleda?= <soyjuanarbol@gmail.com>
Date: Sat, 23 Nov 2024 17:59:49 -0500
Subject: [PATCH] build: enable fdsan in Android
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch will update Android API in CI to 29 and will set up the fdsan
in the test runner.

Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
Fixes: https://github.com/libuv/libuv/issues/4369
---
 .github/workflows/CI-unix.yml |  8 ++++----
 test/runner.c                 | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI-unix.yml b/.github/workflows/CI-unix.yml
index 920cb690..298dca21 100644
--- a/.github/workflows/CI-unix.yml
+++ b/.github/workflows/CI-unix.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Build and Test
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 24
+          api-level: 30
           arch: x86_64
           target: google_apis
           ram-size: 2048M
@@ -51,7 +51,7 @@ jobs:
           disable-animations: true
           script: |
             echo "::group::Configure"
-            cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-24
+            cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-30
             echo "::endgroup::"
 
             echo "::group::Build"
@@ -60,8 +60,8 @@ jobs:
             ## Correct some ld bugs that cause problems with libuv tests
             wget "https://github.com/termux/termux-elf-cleaner/releases/download/v2.2.1/termux-elf-cleaner" -P build
             chmod a+x build/termux-elf-cleaner
-            build/termux-elf-cleaner --api-level 24 ./build/uv_run_tests
-            build/termux-elf-cleaner --api-level 24 ./build/uv_run_tests_a
+            build/termux-elf-cleaner --api-level 30 ./build/uv_run_tests
+            build/termux-elf-cleaner --api-level 30 ./build/uv_run_tests_a
 
             adb shell "su 0 setenforce 0" # to allow some syscalls like link, chmod, etc.
 
diff --git a/test/runner.c b/test/runner.c
index d1dd02f5..54abb39d 100644
--- a/test/runner.c
+++ b/test/runner.c
@@ -27,6 +27,11 @@
 #include "task.h"
 #include "uv.h"
 
+/* Refs: https://github.com/libuv/libuv/issues/4369 */
+#if defined(__ANDROID__)
+#include <android/fdsan.h>
+#endif
+
 char executable_path[sizeof(executable_path)];
 
 
@@ -142,6 +147,13 @@ void log_tap_result(int test_count,
   fflush(stdout);
 }
 
+void enable_fdsan(void) {
+/* Refs: https://github.com/libuv/libuv/issues/4369 */
+#if defined(__ANDROID__)
+  android_fdsan_set_error_level(ANDROID_FDSAN_ERROR_LEVEL_WARN_ALWAYS);
+#endif
+}
+
 
 int run_test(const char* test,
              int benchmark_output,
@@ -160,6 +172,8 @@ int run_test(const char* test,
   main_proc = NULL;
   process_count = 0;
 
+  enable_fdsan();
+
 #ifndef _WIN32
   /* Clean up stale socket from previous run. */
   remove(TEST_PIPENAME);