Create an Android CMake toolchain file instead to cross-compile Testing and add

16 KB page linker flag to 6.2 branch

Author: finagolfin

swift-ci/sdks/android/patches/apply-patches.sh

@@ -5,8 +5,8 @@ cd ${1}
 
 case "${BUILD_SCHEME}" in
     swift-*-branch)
-        git apply -v -C1 ${patches_dir}/swift-android.patch
         git apply -v -C1 ${patches_dir}/swift-android-devel.patch
+        git apply -v -C1 ${patches_dir}/swift-android.patch
         ;;
     development)
         git apply -v -C1 ${patches_dir}/swift-android.patch

swift-ci/sdks/android/patches/swift-android-devel.patch

@@ -1,3 +1,171 @@
+diff --git a/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake b/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
+index 0b18957eadb..5021409ba06 100644
+--- a/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
++++ b/swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
+@@ -2504,6 +2504,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/test/SILOptimizer/concat_string_literals.32.swift b/swift/test/SILOptimizer/concat_string_literals.32.swift
+index 01390761c8c..d84c142397c 100644
+--- a/swift/test/SILOptimizer/concat_string_literals.32.swift
++++ b/swift/test/SILOptimizer/concat_string_literals.32.swift
+@@ -4,6 +4,7 @@
+ 
+ // We have a separate test for 64-bit architectures.
+ // REQUIRES: PTRSIZE=32
++// XFAIL: OS=linux-androideabi
+ 
+ // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
+ // CHECK-LABEL: test_ascii_scalar_scalar2
+diff --git a/swift/utils/swift_build_support/swift_build_support/products/product.py b/swift/utils/swift_build_support/swift_build_support/products/product.py
+index 47e7ab79905..6bd94c3cad8 100644
+--- a/swift/utils/swift_build_support/swift_build_support/products/product.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/product.py
+@@ -389,7 +389,7 @@ class Product(object):
+         sysroot_arch, vendor, abi = self.get_linux_target_components(arch)
+         return '{}-{}-linux-{}'.format(sysroot_arch, vendor, abi)
+ 
+-    def generate_linux_toolchain_file(self, platform, arch):
++    def generate_linux_toolchain_file(self, platform, arch, crosscompiling=True):
+         """
+         Generates a new CMake tolchain file that specifies Linux as a target
+         platform.
+@@ -402,18 +402,34 @@ class Product(object):
+ 
+         toolchain_args = {}
+ 
+-        toolchain_args['CMAKE_SYSTEM_NAME'] = 'Linux'
+-        toolchain_args['CMAKE_SYSTEM_PROCESSOR'] = arch
++        if crosscompiling:
++            if platform == "linux":
++                toolchain_args['CMAKE_SYSTEM_NAME'] = 'Linux'
++                toolchain_args['CMAKE_SYSTEM_PROCESSOR'] = arch
++            elif platform == "android":
++                toolchain_args['CMAKE_SYSTEM_NAME'] = 'Android'
++                toolchain_args['CMAKE_SYSTEM_VERSION'] = self.args.android_api_level
++                toolchain_args['CMAKE_SYSTEM_PROCESSOR'] = arch if not arch == 'armv7' \
++                                                           else 'armv7-a'
++                toolchain_args['CMAKE_ANDROID_NDK'] = self.args.android_ndk
++                toolchain_args['CMAKE_FIND_ROOT_PATH'] = self.args.cross_compile_deps_path
++                # This is a workaround for a CMake 3.30+ bug,
++                # https://gitlab.kitware.com/cmake/cmake/-/issues/26154, and can
++                # be removed once that is fixed.
++                toolchain_args['CMAKE_SHARED_LINKER_FLAGS'] = '\"\"'
+ 
+         # We only set the actual sysroot if we are actually cross
+         # compiling. This is important since otherwise cmake seems to change the
+         # RUNPATH to be a relative rather than an absolute path, breaking
+         # certain cmark tests (and maybe others).
+-        maybe_sysroot = self.get_linux_sysroot(platform, arch)
+-        if maybe_sysroot is not None:
+-            toolchain_args['CMAKE_SYSROOT'] = maybe_sysroot
+-
+-        target = self.get_linux_target(platform, arch)
++        if platform == "linux":
++            maybe_sysroot = self.get_linux_sysroot(platform, arch)
++            if maybe_sysroot is not None:
++                toolchain_args['CMAKE_SYSROOT'] = maybe_sysroot
++
++            target = self.get_linux_target(platform, arch)
++        elif platform == "android":
++            target = '%s-unknown-linux-android%s' % (arch, self.args.android_api_level)
+         if self.toolchain.cc.endswith('clang'):
+             toolchain_args['CMAKE_C_COMPILER_TARGET'] = target
+         if self.toolchain.cxx.endswith('clang++'):
+@@ -459,10 +475,30 @@ class Product(object):
+                 platform, arch,
+                 macos_deployment_version=override_macos_deployment_version)
+             self.cmake_options.define('CMAKE_TOOLCHAIN_FILE:PATH', toolchain_file)
+-        elif platform == "linux":
+-            toolchain_file = self.generate_linux_toolchain_file(platform, arch)
++        elif platform == "linux" or platform == "android":
++            # Always cross-compile for linux, but not on Android, as a native
++            # compile on Android does not use the NDK and its CMake config.
++            cross_compile = platform == "linux" or \
++                self.is_cross_compile_target(host_target)
++            toolchain_file = self.generate_linux_toolchain_file(platform, arch,
++                                                                cross_compile)
+             self.cmake_options.define('CMAKE_TOOLCHAIN_FILE:PATH', toolchain_file)
+ 
++            if cross_compile and platform == "android":
++                resource_dir = None
++                # build-script-impl products build before the install and use
++                # the Swift stdlib from the compiler build directory instead,
++                # while products built even before that currently do not support
++                # cross-compiling Swift.
++                if not self.is_before_build_script_impl_product() and \
++                   not self.is_build_script_impl_product():
++                    install_path = self.host_install_destdir(host_target) + \
++                        self.args.install_prefix
++                    resource_dir = '%s/lib/swift' % install_path
++                flags = targets.StdlibDeploymentTarget.get_target_for_name(
++                    host_target).platform.swift_flags(self.args, resource_dir)
++                self.cmake_options.define('CMAKE_Swift_FLAGS', flags)
++
+         return toolchain_file
+ 
+     def get_openbsd_toolchain_file(self):
+diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
+index 417056efdd0..177ea9f0623 100644
+--- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
+@@ -127,3 +127,11 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
+         install_prefix = install_destdir + self.args.install_prefix
+ 
+         self.install_with_cmake(['install'], install_prefix)
++
++    @classmethod
++    def is_build_script_impl_product(cls):
++        return False
++
++    @classmethod
++    def is_before_build_script_impl_product(cls):
++        return False
+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 508d6204eaf..64a862eaf0e 100644
+--- a/swift/utils/swift_build_support/swift_build_support/targets.py
++++ b/swift/utils/swift_build_support/swift_build_support/targets.py
+@@ -72,7 +72,7 @@ class Platform(object):
+                 return True
+         return False
+ 
+-    def swift_flags(self, args):
++    def swift_flags(self, args, resource_path=None):
+         """
+         Swift compiler flags for a platform, useful for cross-compiling
+         """
+@@ -154,17 +154,21 @@ class AndroidPlatform(Platform):
+         """
+         return True
+ 
+-    def swift_flags(self, args):
++    def swift_flags(self, args, resource_path=None):
+         flags = '-target %s-unknown-linux-android%s ' % (args.android_arch,
+                                                          args.android_api_level)
+ 
+-        flags += '-resource-dir %s/swift-%s-%s/lib/swift ' % (
+-                 args.build_root, self.name, args.android_arch)
++        if resource_path is not None:
++            flags += '-resource-dir %s ' % (resource_path)
++        else:
++            flags += '-resource-dir %s/swift-%s-%s/lib/swift ' % (
++                     args.build_root, self.name, args.android_arch)
+ 
+         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):
 diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
 index bfb69965890..b5e9f5349c2 100644
 --- a/swift/utils/swift_build_support/swift_build_support/cmake.py

swift-ci/sdks/android/patches/swift-android.patch

@@ -1,15 +1,3 @@
-diff --git a/swift/test/SILOptimizer/concat_string_literals.32.swift b/swift/test/SILOptimizer/concat_string_literals.32.swift
-index 01390761c8c..d84c142397c 100644
---- a/swift/test/SILOptimizer/concat_string_literals.32.swift
-+++ b/swift/test/SILOptimizer/concat_string_literals.32.swift
-@@ -4,6 +4,7 @@
- 
- // We have a separate test for 64-bit architectures.
- // REQUIRES: PTRSIZE=32
-+// XFAIL: OS=linux-androideabi
- 
- // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
- // CHECK-LABEL: test_ascii_scalar_scalar2
 diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
 index 16e05052609..7ab8cebfab8 100755
 --- a/swift/utils/build-script-impl
@@ -22,43 +10,3 @@ index 16e05052609..7ab8cebfab8 100755
 
                    cmake_options=(
                      -DENABLE_SWIFT=YES
-diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
-index 324d1a77eea..e88601a8701 100644
---- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
-+++ b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
-@@ -13,6 +13,9 @@
- import os
- 
- from build_swift.build_swift.versions import Version
-+from ..host_specific_configuration \
-+    import HostSpecificConfiguration
-+from ..targets import StdlibDeploymentTarget
- 
- from . import cmake_product
- from . import product
-@@ -115,6 +117,25 @@ class SwiftTestingCMakeShim(cmake_product.CMakeProduct):
-         # FIXME: If we build macros for the builder, specify the path.
-         self.cmake_options.define('SwiftTesting_MACRO', 'NO')
- 
-+        if host_target.startswith('android') and self.is_cross_compile_target(host_target):
-+            host_config = HostSpecificConfiguration(host_target, self.args)
-+            self.cmake_options.extend(host_config.cmake_options)
-+            triple = '%s-unknown-linux-android%s' % (self.args.android_arch,
-+                                                     self.args.android_api_level)
-+            flags = '-target %s ' % (triple)
-+
-+            flags += '-resource-dir %s/lib/swift ' % (
-+                     self.host_install_destdir(host_target) + self.args.install_prefix)
-+
-+            ndk_path = StdlibDeploymentTarget.get_target_for_name(host_target).platform.ndk_toolchain_path(self.args)
-+            flags += '-sdk %s/sysroot ' % (ndk_path)
-+            flags += '-tools-directory %s/bin' % (ndk_path)
-+            self.cmake_options.define('CMAKE_Swift_FLAGS', flags)
-+            self.cmake_options.define('CMAKE_Swift_COMPILER_TARGET', triple)
-+            self.cmake_options.define('CMAKE_CXX_COMPILER_WORKS', 'True')
-+            self.cmake_options.define('CMAKE_SHARED_LINKER_FLAGS', '')
-+            self.cmake_options.define('CMAKE_FIND_ROOT_PATH', self.args.cross_compile_deps_path)
-+
-         self.generate_toolchain_file_for_darwin_or_linux(
-             host_target, override_macos_deployment_version=override_deployment_version)
-         self.build_with_cmake([], self.args.build_variant, [],