Pull in Marc's upstream patch to build for 16KB pages on the CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -124,7 +124,7 @@ jobs:
 
           ANDROID_ARCH=aarch64 BUILD_SWIFT_PM=1 ${TOOLCHAIN}/bin/swift get-packages-and-swift-source.swift
 
-          git apply -C1 swift-android.patch swift-android-ci.patch
+          git apply -C1 swift-android.patch swift-android-ci.patch swift-android-16k-pages.patch
           BUILD_FLAG="--foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
           if ${{ matrix.version == 'release' }}; then
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake

swift-android-16k-pages.patch

@@ -0,0 +1,34 @@
+From 8db43c6290ee04145264c04728a030dd74f87452
+From: Marc Prud'hommeaux <[email protected]>
+Date: Sun, 18 May 2025 19:10:36 -0400
+Subject: Support 16 KB page sizes on Android
+
+Android 15+ requires that native libraries be compiled with a linker flag to support 16 KB page sizes. See: https://developer.android.com/guide/practices/page-sizes#compile-r26-lower
+
+diff --git a/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake b/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
+index ce113989ad75d..089f5f30acbb5 100644
+--- a/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
++++ b/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
+@@ -2469,6 +2469,8 @@ function(add_swift_target_library name)
+         list(APPEND swiftlib_link_flags_all "-shared")
+         # TODO: Instead of `lib${name}.so` find variable or target property which already have this value.
+         list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")
++        # Ensure compatibility with Android 15+ devices using 16KB memory pages.
++        list(APPEND swiftlib_link_flags_all "-Wl,-z,max-page-size=16384")
+       endif()
+ 
+       if (SWIFTLIB_BACK_DEPLOYMENT_LIBRARY)
+diff --git a/swift/utils/swift_build_support/swift_build_support/targets.py b/swift/utils/swift_build_support/swift_build_support/targets.py
+index fba09416ddb90..7f3f35ec8097c 100644
+--- a/swift/utils/swift_build_support/swift_build_support/targets.py
++++ b/swift/utils/swift_build_support/swift_build_support/targets.py
+@@ -164,7 +164,8 @@ def swift_flags(self, args):
+         android_toolchain_path = self.ndk_toolchain_path(args)
+ 
+         flags += '-sdk %s/sysroot ' % (android_toolchain_path)
+-        flags += '-tools-directory %s/bin' % (android_toolchain_path)
++        flags += '-tools-directory %s/bin ' % (android_toolchain_path)
++        flags += '-Xclang-linker -Wl,-z,max-page-size=16384'
+         return flags
+ 
+     def cmake_options(self, args):