From 6905714986c0cfa6fde4d5c40799e21d298a6568 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <madebr@users.noreply.github.com>
Date: Wed, 12 Nov 2025 00:41:43 +0100
Subject: [PATCH] android: remove dependency on cpu-features.h

android: remove dependency on cpu-features.h

getauxval got introduced into bionic well before Android 5.0
---
 Android.mk                | 3 ---
 CMakeLists.txt            | 6 ------
 src/cpuinfo/SDL_cpuinfo.c | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/Android.mk b/Android.mk
index 87dd21a867..f4600bfa27 100644
--- a/Android.mk
+++ b/Android.mk
@@ -112,8 +112,6 @@ ifeq ($(NDK_DEBUG),1)
     cmd-strip :=
 endif
 
-LOCAL_STATIC_LIBRARIES := cpufeatures
-
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -145,4 +143,3 @@ LOCAL_EXPORT_LDLIBS :=
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,android/cpufeatures)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdaee72811..8bfe65da1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1407,8 +1407,6 @@ if(ANDROID)
     "${SDL3_SOURCE_DIR}/src/core/android/*.c"
     "${SDL3_SOURCE_DIR}/src/core/android/*.h"
   )
-  sdl_sources("${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
-  set_property(SOURCE "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-declaration-after-statement")
 
   sdl_glob_sources(
     "${SDL3_SOURCE_DIR}/src/misc/android/*.c"
@@ -3819,10 +3817,6 @@ else()
   set(ARCH_64 FALSE)
 endif()
 
-if(ANDROID)
-  sdl_include_directories(PRIVATE SYSTEM "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures")
-endif()
-
 if(APPLE)
   cmake_push_check_state(RESET)
   check_c_compiler_flag(-fobjc-arc COMPILER_SUPPORTS_FOBJC_ARC)
diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
index c277db837a..2692d19fe5 100644
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -76,10 +76,6 @@
 #include <sys/param.h>
 #endif
 
-#if defined(SDL_PLATFORM_ANDROID) && defined(__arm__) && !defined(HAVE_GETAUXVAL)
-#include <cpu-features.h>
-#endif
-
 #if defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO)
 #include <sys/auxv.h>
 #endif