From 53dbe1862ebd184965ec6faea91ebf4963829924 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 7 Aug 2025 11:38:24 -0700
Subject: [PATCH] Revert "Support Google Play 16 KB Page Size Requirement
 (#13470)"

This reverts commit 4b2aa3f102697b1ace7455c24c6c07f802c07476.

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.
---
 Android.mk          | 4 ----
 CMakeLists.txt      | 3 ---
 test/CMakeLists.txt | 1 -
 3 files changed, 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index 95dda5566a..3ccbd44ca1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,10 +88,6 @@ ifeq ($(NDK_DEBUG),1)
     cmd-strip :=
 endif
 
-# https://developer.android.com/guide/practices/page-sizes
-LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
-LOCAL_LDFLAGS += "-Wl,-z,common-page-size=16384"
-
 LOCAL_STATIC_LIBRARIES := cpufeatures
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccf0f76e02..6c66a0d94c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1275,9 +1275,6 @@ if(ANDROID)
     set(HAVE_SDL_MISC TRUE)
   endif()
 
-  # https://developer.android.com/guide/practices/page-sizes
-  list(APPEND EXTRA_LDFLAGS_BUILD "-Wl,-z,max-page-size=16384" "-Wl,-z,common-page-size=16384")
-
   # SDL_spinlock.c Needs to be compiled in ARM mode.
   # There seems to be no better way currently to set the ARM mode.
   # see: https://issuetracker.google.com/issues/62264618
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 88f3ddb3df..7cabbc3603 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -40,7 +40,6 @@ macro(add_sdl_test_executable TARGET)
     list(APPEND SDLTEST_TARGETS ${TARGET})
     if(ANDROID)
         add_library(${TARGET} SHARED ${AST_UNPARSED_ARGUMENTS})
-        set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
     else()
         add_executable(${TARGET} ${AST_UNPARSED_ARGUMENTS})
     endif()