gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: remove dependency on cpu-features.h

Browse Source 
android: remove dependency on cpu-features.h

getauxval got introduced into bionic well before Android 5.0
This commit is contained in:
Anonymous Maarten
2025-11-12 00:41:43 +01:00
committed by GitHub
parent 25ab8c99df
commit 6905714986
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -112,8 +112,6 @@ ifeq ($(NDK_DEBUG),1)
cmd-strip := cmd-strip :=
endif endif
LOCAL_STATIC_LIBRARIES := cpufeatures
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@@ -145,4 +143,3 @@ LOCAL_EXPORT_LDLIBS :=
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
$(call import-module,android/cpufeatures)

6
CMakeLists.txt
View File

@@ -1407,8 +1407,6 @@ if(ANDROID)
"${SDL3_SOURCE_DIR}/src/core/android/*.c" "${SDL3_SOURCE_DIR}/src/core/android/*.c"
"${SDL3_SOURCE_DIR}/src/core/android/*.h" "${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( sdl_glob_sources(
"${SDL3_SOURCE_DIR}/src/misc/android/*.c" "${SDL3_SOURCE_DIR}/src/misc/android/*.c"
@@ -3819,10 +3817,6 @@ else()
set(ARCH_64 FALSE) set(ARCH_64 FALSE)
endif() endif()
if(ANDROID)
sdl_include_directories(PRIVATE SYSTEM "${CMAKE_ANDROID_NDK}/sources/android/cpufeatures")
endif()
if(APPLE) if(APPLE)
cmake_push_check_state(RESET) cmake_push_check_state(RESET)
check_c_compiler_flag(-fobjc-arc COMPILER_SUPPORTS_FOBJC_ARC) check_c_compiler_flag(-fobjc-arc COMPILER_SUPPORTS_FOBJC_ARC)

4
src/cpuinfo/SDL_cpuinfo.c
View File

@@ -76,10 +76,6 @@
#include <sys/param.h> #include <sys/param.h>
#endif #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) #if defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO)
#include <sys/auxv.h> #include <sys/auxv.h>
#endif #endif