Skip to content

cmake: only need cpu-feature.c from ndk on 32-bit ARM and when getauxval is unavailable #14449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2025
+0 −13
Merged

cmake: only need cpu-feature.c from ndk on 32-bit ARM and when getauxval is unavailable #14449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b034603
cmake: only need cpu-feature.c from ndk on 32-bit ARM and when getaux…
madebr Nov 11, 2025
ef84f16
android: remove dependency on cpu-features.h
madebr Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ ifeq ($(NDK_DEBUG),1)
cmd-strip :=
endif

LOCAL_STATIC_LIBRARIES := cpufeatures

include $(BUILD_SHARED_LIBRARY)


Expand Down Expand Up @@ -145,4 +143,3 @@ LOCAL_EXPORT_LDLIBS :=

include $(BUILD_STATIC_LIBRARY)

$(call import-module,android/cpufeatures)
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions src/cpuinfo/SDL_cpuinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading