Skip to content

Commit 4ed91da

Browse files
committed
Revert "android: support Google Play 16 kiB page size requirement"
This reverts commit 7ebec86. If you need to support the Google Play 16 kiB page size requirement, the recommendation is to use NDK r28c or newer, which automatically aligns binaries correctly.
1 parent 9286768 commit 4ed91da

File tree

4 files changed

+0
-14
lines changed

4 files changed

+0
-14
lines changed

Android.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ endif
159159

160160
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
161161

162-
# https://developer.android.com/guide/practices/page-sizes
163-
LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
164-
LOCAL_LDFLAGS += "-Wl,-z,common-page-size=16384"
165-
166162
include $(BUILD_SHARED_LIBRARY)
167163

168164
###########################

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ if(SDLMIXER_BUILD_SHARED_LIBS)
262262
target_link_libraries(${sdl3_mixer_target_name} PRIVATE SDL3::SDL3-shared)
263263
endif()
264264
sdl_add_warning_options(${sdl3_mixer_target_name} WARNING_AS_ERROR ${SDLMIXER_WERROR})
265-
sdl_add_platform_link_options(${sdl3_mixer_target_name})
266265
if(WIN32 AND BUILD_SHARED_LIBS)
267266
target_sources(${sdl3_mixer_target_name} PRIVATE
268267
src/version.rc
@@ -1141,7 +1140,6 @@ if(SDLMIXER_SAMPLES)
11411140
target_compile_features(${TARGET} PRIVATE c_std_99)
11421141
endif()
11431142
sdl_add_warning_options(${TARGET} WARNING_AS_ERROR ${SDLMIXER_WERROR})
1144-
sdl_add_platform_link_options(${TARGET})
11451143
sdl_target_link_options_no_undefined(${TARGET})
11461144
target_link_libraries(${TARGET} PRIVATE SDL3::SDL3_test)
11471145
target_link_libraries(${TARGET} PRIVATE SDL3_mixer::${sdl3_mixer_target_name})

cmake/PrivateSdlFunctions.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,6 @@ function(sdl_add_warning_options TARGET)
313313
endif()
314314
endfunction()
315315

316-
function(sdl_add_platform_link_options TARGET)
317-
if(ANDROID)
318-
target_link_options(${TARGET} PRIVATE "-Wl,-z,max-page-size=16384")
319-
target_link_options(${TARGET} PRIVATE "-Wl,-z,common-page-size=16384")
320-
endif()
321-
endfunction()
322-
323316
function(sdl_no_deprecated_errors TARGET)
324317
check_c_compiler_flag(-Wno-error=deprecated-declarations HAVE_WNO_ERROR_DEPRECATED_DECLARATIONS)
325318
if(HAVE_WNO_ERROR_DEPRECATED_DECLARATIONS)

test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ function(add_sdl_mixer_test_executable TARGET)
1515
$<TARGET_PROPERTY:${sdl3_mixer_target_name},COMPILE_DEFINITIONS>
1616
)
1717
sdl_add_warning_options(${TARGET} WARNING_AS_ERROR ${SDLMIXER_WERROR})
18-
sdl_add_platform_link_options(${TARGET})
1918
target_link_libraries(${TARGET} PRIVATE SDL3_mixer::SDL3_mixer SDL3::SDL3)
2019

2120
if(SDLMIXER_TESTS_INSTALL)

0 commit comments

Comments
 (0)