Skip to content

Commit 8b2aa93

Browse files
committed
Revert "android: support Google Play 16 kiB page size requirement"
This reverts commit 6463498. 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 6463498 commit 8b2aa93

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed

Android.mk

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

164164
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
165165

166-
# https://developer.android.com/guide/practices/page-sizes
167-
LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
168-
LOCAL_LDFLAGS += "-Wl,-z,common-page-size=16384"
169-
170166
include $(BUILD_SHARED_LIBRARY)
171167

172168
###########################

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ add_library(SDL2_mixer
241241
src/utils.c
242242
)
243243
add_library(SDL2_mixer::${sdl2_mixer_export_name} ALIAS SDL2_mixer)
244-
sdl_add_platform_link_options(SDL2_mixer)
245244
target_include_directories(SDL2_mixer
246245
PUBLIC
247246
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
@@ -1016,7 +1015,6 @@ if(SDL2MIXER_SAMPLES)
10161015

10171016
foreach(prog playmus playwave)
10181017
# FIXME: mingw should be handled by SDL2::SDL2(-static) target
1019-
sdl_add_platform_link_options(${prog})
10201018
if(MINGW)
10211019
target_link_libraries(${prog} PRIVATE mingw32)
10221020
target_link_options(${prog} PRIVATE -mwindows)

cmake/PrivateSdlFunctions.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,3 @@ function(sdl_target_link_options_no_undefined TARGET)
287287
endif()
288288
endif()
289289
endfunction()
290-
291-
function(sdl_add_platform_link_options TARGET)
292-
if(ANDROID)
293-
target_link_options(${TARGET} PRIVATE "-Wl,-z,max-page-size=16384")
294-
target_link_options(${TARGET} PRIVATE "-Wl,-z,common-page-size=16384")
295-
endif()
296-
endfunction()

0 commit comments

Comments
 (0)