From 01353517cab4ba267f0cd290376f31c9899d07fa Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Fri, 6 Dec 2024 09:41:54 -0500 Subject: [PATCH 1/2] Update buildbot_linux_crosscompile_android preset --- utils/build-presets.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 884f64a260830..db507713e8b09 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -997,8 +997,6 @@ build-ninja android android-ndk=%(ndk_path)s android-api-level=21 -build-swift-static-stdlib -build-swift-static-sdk-overlay build-swift-stdlib-unittest-extra # Path to the root of the installation filesystem. @@ -1011,13 +1009,11 @@ host-test install-prefix=/usr install-llvm -install-static-linux-config install-swift install-swiftsyntax skip-test-linux skip-build-benchmarks -skip-early-swiftsyntax reconfigure From 0107a555cd602ebf8ce03115553d1d4434af6a42 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Fri, 6 Dec 2024 13:27:13 -0500 Subject: [PATCH 2/2] Add preset buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,x86_64 --- utils/build-presets.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/build-presets.ini b/utils/build-presets.ini index db507713e8b09..760feb18bebbc 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -1022,6 +1022,11 @@ mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build android-arch=aarch64 +[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,x86_64] +mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build + +android-arch=x86_64 + # Ubuntu 18.04 preset for backwards compat and future customizations. [preset: buildbot_linux_1804] mixin-preset=buildbot_linux