Skip to content

Commit fffd0d1

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

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

Android.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,4 @@ LOCAL_SHARED_LIBRARIES := SDL2
1313

1414
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
1515

16-
# https://developer.android.com/guide/practices/page-sizes
17-
LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
18-
LOCAL_LDFLAGS += "-Wl,-z,common-page-size=16384"
19-
2016
include $(BUILD_SHARED_LIBRARY)

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ add_library(SDL2_net
8585
)
8686

8787
add_library(SDL2_net::${sdl2_net_export_name} ALIAS SDL2_net)
88-
sdl_add_platform_link_options(SDL2_net)
8988
target_include_directories(SDL2_net
9089
PRIVATE
9190
"${CMAKE_CURRENT_LIST_DIR}/src"
@@ -292,17 +291,14 @@ if(SDL2NET_SAMPLES)
292291
add_executable(showinterfaces examples/showinterfaces.c)
293292
target_compile_definitions(showinterfaces PRIVATE SDL_MAIN_HANDLED)
294293
target_link_libraries(showinterfaces PRIVATE SDL2_net::${sdl2_net_export_name} ${sdl2_target_name})
295-
sdl_add_platform_link_options(showinterfaces)
296294

297295
add_executable(chat examples/chat.c examples/chat.h)
298296
if(TARGET SDL2::SDL2main)
299297
target_link_libraries(chat PRIVATE SDL2::SDL2main)
300298
endif()
301299
target_link_libraries(chat PRIVATE SDL2_net::${sdl2_net_export_name} SDL2::SDL2test ${sdl2_target_name})
302-
sdl_add_platform_link_options(chat)
303300

304301
add_executable(chatd examples/chatd.c examples/chat.h)
305302
target_compile_definitions(chatd PRIVATE SDL_MAIN_HANDLED)
306303
target_link_libraries(chatd PRIVATE SDL2_net::${sdl2_net_export_name} ${sdl2_target_name})
307-
sdl_add_platform_link_options(chatd)
308304
endif()

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)