[build][android] Use a CMake toolchain file to cross-compile Testing #83260

finagolfin · 2025-07-23T11:10:54Z

@gottesmm and @etcwilde, I believe you two are most familiar with this build-script feature, let me know what you think. I reused the linux toolchain file generation for Android, as they have a lot in common, but can separate the two if wanted. This pull was tested by cross-compiling on my Android CI, and natively on Android in the Termux app.

I will look at cross-compiling Foundation dependencies like libcurl with this new Android toolchain file in a subsequent pull.

finagolfin · 2025-07-23T11:19:45Z

utils/swift_build_support/swift_build_support/targets.py

This method is currently used to generate Swift cross-compilation flags for build-script-impl products alone, but I was able to reuse it for Testing by passing in a separate resource_path. That resource_path calculation can only be done externally, where the particular build product is known.

finagolfin · 2025-07-23T11:20:51Z

@swift-ci test

xavgru12 · 2025-07-23T11:44:16Z

This looks great and is useful for cross compilation in general!

finagolfin · 2025-07-23T12:20:17Z

@swift-ci smoke test

finagolfin · 2025-07-23T12:22:10Z

Updated to refactor a bit and disable a recently failing but unrelated test on 32-bit Android.

finagolfin · 2025-07-24T04:37:09Z

@swift-ci smoke test macos

finagolfin · 2025-07-28T14:12:57Z

Ping @etcwilde, any feedback on this small Android-only pull? I'd like to get it into 6.2 next, works well on my CI.

finagolfin · 2025-07-30T08:11:19Z

Updated to enable a test that now passes and rebased.

@swift-ci smoke test

finagolfin · 2025-08-01T08:46:45Z

@MaxDesiatov, you've also modified this code, perhaps you can review?

Also, disable a recently failing test for Android armv7 and enable another one that now passes.

finagolfin · 2025-08-01T15:50:54Z

Added a validation test, made sure it worked on linux, and rebased.

@swift-ci smoke test

finagolfin · 2025-08-02T09:56:48Z

Going ahead and merging because this only affects Android, passed the CI, and I want to get it into 6.2 next. If anyone finally reviews it and wants anything changed, I can always do that later.

shahmishal · 2025-08-05T20:03:18Z

We noticed a FreeBSD test failure with this change.

2:46:55  ******************** TEST 'Swift-validation(freebsd-x86_64) :: BuildSystem/cmark_crosscompile_using_toolchain_always.test' FAILED ********************
22:46:55  Exit Code: 1
22:46:55  
22:46:55  Command Output (stderr):
22:46:55  --
22:46:55  RUN: at line 3: rm -rf "/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp" && mkdir -p "/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp"
22:46:55  + rm -rf /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp
22:46:55  + mkdir -p /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp
22:46:55  RUN: at line 4: mkdir -p /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp
22:46:55  + mkdir -p /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp
22:46:55  RUN: at line 5: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/utils/build-script --dry-run --install-all --cmake /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/cmake-freebsd-x86_64/bin/cmake --skip-build-llvm --skip-build-swift 2>&1 | /usr/local/bin/python3.11 /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/utils/PathSanitizingFileCheck --allow-unused-prefixes --sanitize BUILD_DIR=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64 --sanitize SOURCE_DIR=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift --ignore-runtime-warnings --use-filecheck /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/llvm-freebsd-x86_64/bin/FileCheck   /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/validation-test/BuildSystem/cmark_crosscompile_using_toolchain_always.test
22:46:55  + SKIP_XCODE_VERSION_CHECK=1
22:46:55  + SWIFT_BUILD_ROOT=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp
22:46:55  + /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/utils/build-script --dry-run --install-all --cmake /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/cmake-freebsd-x86_64/bin/cmake --skip-build-llvm --skip-build-swift
22:46:55  + /usr/local/bin/python3.11 /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/utils/PathSanitizingFileCheck --allow-unused-prefixes --sanitize BUILD_DIR=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/swift-freebsd-x86_64 --sanitize SOURCE_DIR=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift --ignore-runtime-warnings --use-filecheck /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/llvm-freebsd-x86_64/bin/FileCheck /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/validation-test/BuildSystem/cmark_crosscompile_using_toolchain_always.test
22:46:55  /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/validation-test/BuildSystem/cmark_crosscompile_using_toolchain_always.test:8:10: error: CHECK: expected string not found in input
22:46:55  # CHECK: DRY_RUN! Writing Toolchain file to path:{{.*}}BuildScriptToolchain.cmake
22:46:55           ^
22:46:55  <stdin>:1:1: note: scanning from here
22:46:55  [SOURCE_DIR/utils/build-script] NOTE: Using toolchain default
22:46:55  ^
22:46:55  
22:46:55  Input file: <stdin>
22:46:55  Check file: /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/swift/validation-test/BuildSystem/cmark_crosscompile_using_toolchain_always.test
22:46:55  
22:46:55  -dump-input=help explains the following input dump.
22:46:55  
22:46:55  Input was:
22:46:55  <<<<<<
22:46:55           1: [SOURCE_DIR/utils/build-script] NOTE: Using toolchain default 
22:46:55  check:8     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
22:46:55           2: + /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/cmake-freebsd-x86_64/bin/cmake --version 
22:46:55  check:8     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22:46:55           3: --- Local Ninja Build --- 
22:46:55  check:8     ~~~~~~~~~~~~~~~~~~~~~~~~~~
22:46:55           4: + /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/cmake-freebsd-x86_64/bin/cmake -S /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/ninja -B BUILD_DIR/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp/Ninja-DebugAssert/ninja-build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_C_COMPILER=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/llvm-freebsd-x86_64/./bin/clang -DCMAKE_CXX_COMPILER=/home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/buildbot_freebsd/llvm-freebsd-x86_64/./bin/clang++ 
22:46:55  check:8     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22:46:55           5: + /home/ec2-user/jenkins/workspace/swift-bootstrap-freebsd-14-x86_64/build/cmake-freebsd-x86_64/bin/cmake --build BUILD_DIR/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp/Ninja-DebugAssert/ninja-build 
22:46:55  check:8     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22:46:55           6: + mkdir -p BUILD_DIR/validation-test-freebsd-x86_64/BuildSystem/Output/cmark_crosscompile_using_toolchain_always.test.tmp/Ninja-DebugAssert 
22:46:55  check:8     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22:46:55           .
22:46:55           .
22:46:55           .
22:46:55  >>>>>>
22:46:55  
22:46:55  --
22:46:55  
22:46:55  ********************

finagolfin · 2025-08-06T08:55:54Z

@shahmishal, ah, was a bit confused initially, as this pull has nothing to do with FreeBSD, but I then noticed that I just enabled this test on non-macOS platforms, since I figured that all the build-script platforms that have CI- macOS, linux, and soon Android- are now using these CMake toolchain files to compile cmark. I was unaware of the new FreeBSD CI, so we will have to adjust the test for that, if it is not using toolchain files yet.

@etcwilde, would you like me to disable this test again for FreeBSD alone, or do you have any plans to have it use toolchain files also? Let me know what you'd like to do about this failing test on the new FreeBSD CI, great news that it is up btw! 😄

etcwilde · 2025-08-06T16:59:51Z

I'll XFAIL it for now. If we do add the generated toolchain files, the test should fail and then we can revert the XFAIL.

…83260) Also, disable a recently failing test for Android armv7.

This new flag makes it easy to build Swift cross-compilation toolchains, by disabling cross-compilation of all host tools, like the Swift compiler and various macros, building on prior pulls #38441 and #82163. Also, add two class methods to the Testing macros product so it works with #83260.

…83260) Also, disable a recently failing test for Android armv7.

This new flag makes it easy to build Swift cross-compilation toolchains, by disabling cross-compilation of all host tools, like the Swift compiler and various macros, building on prior pulls #38441 and #82163. Also, add two class methods to the Testing macros product so it works with #83260.

finagolfin requested review from etcwilde, justice-adams-apple and shahmishal as code owners July 23, 2025 11:10

finagolfin commented Jul 23, 2025

View reviewed changes

finagolfin force-pushed the droid branch from 69eef12 to 75f1fbb Compare July 23, 2025 12:19

finagolfin requested a review from eeckstein as a code owner July 23, 2025 12:19

finagolfin force-pushed the droid branch from 75f1fbb to 3df707a Compare July 30, 2025 08:10

MaxDesiatov requested review from edymtt and stmontgomery August 1, 2025 08:48

[build][android] Use a CMake toolchain file to cross-compile Testing

33bf9f6

Also, disable a recently failing test for Android armv7 and enable another one that now passes.

finagolfin force-pushed the droid branch from 3df707a to 33bf9f6 Compare August 1, 2025 15:49

finagolfin merged commit 09a751f into swiftlang:main Aug 2, 2025
3 checks passed

finagolfin deleted the droid branch August 2, 2025 09:59

finagolfin mentioned this pull request Aug 2, 2025

[6.2][build] Make it possible to build a cross-compilation toolchain for Android, including Testing #83503

Merged

finagolfin mentioned this pull request Aug 19, 2025

[6.2.1][build] Make it possible to build a cross-compilation toolchain for Android, including Testing #83809

Merged

finagolfin added a commit that referenced this pull request Aug 22, 2025

[build][android] Use a CMake toolchain file to cross-compile Testing (#…

2c9dcfe

…83260) Also, disable a recently failing test for Android armv7.

finagolfin mentioned this pull request Sep 2, 2025

[6.2.0][build] Make it possible to build a cross-compilation toolchain for Android, including Testing #84061

Closed

shahmishal pushed a commit that referenced this pull request Sep 18, 2025

[build][android] Use a CMake toolchain file to cross-compile Testing (#…

2de7f94

…83260) Also, disable a recently failing test for Android armv7.

[build][android] Use a CMake toolchain file to cross-compile Testing #83260

[build][android] Use a CMake toolchain file to cross-compile Testing #83260

Uh oh!

Conversation

finagolfin commented Jul 23, 2025

Uh oh!

finagolfin Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

finagolfin commented Jul 23, 2025

Uh oh!

xavgru12 commented Jul 23, 2025

Uh oh!

finagolfin commented Jul 23, 2025

Uh oh!

finagolfin commented Jul 23, 2025

Uh oh!

finagolfin commented Jul 24, 2025

Uh oh!

finagolfin commented Jul 28, 2025

Uh oh!

finagolfin commented Jul 30, 2025

Uh oh!

finagolfin commented Aug 1, 2025

Uh oh!

finagolfin commented Aug 1, 2025

Uh oh!

finagolfin commented Aug 2, 2025

Uh oh!

Uh oh!

shahmishal commented Aug 5, 2025

Uh oh!

finagolfin commented Aug 6, 2025

Uh oh!

etcwilde commented Aug 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants