Skip to content

Commit c366dc3

Browse files
committed
[android] Split the Android CI build presets.
By not depending on buildbot_linux, the changes there will not affect the Android builders. It will mean having to move the intended changes manually, but it will hopefully be more stable.
1 parent 1ea23d9 commit c366dc3

File tree

1 file changed

+36
-20
lines changed

1 file changed

+36
-20
lines changed

utils/build-presets.ini

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -818,13 +818,22 @@ mixin-preset=
818818
mixin_buildbot_linux,no_test
819819

820820
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
821-
mixin-preset=buildbot_linux
822-
823-
host-test
821+
mixin-preset=
822+
mixin_lightweight_assertions
823+
mixin_linux_install_components_with_clang
824+
build-subdir=buildbot_linux
824825

825826
release
826-
assertions
827-
extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF
827+
test
828+
validation-test
829+
long-test
830+
stress-test
831+
test-optimized
832+
lit-args=-v --time-tests
833+
834+
build-ninja
835+
libicu
836+
libcxx
828837

829838
dash-dash
830839

@@ -837,23 +846,30 @@ android-icu-i18n=%(arm_dir)s/libicui18nswift.so
837846
android-icu-i18n-include=%(arm_dir)s/icu/source/i18n
838847
android-icu-data=%(arm_dir)s/libicudataswift.so
839848

840-
# Disable many build host products. They are unrelated to Android. Foundation,
841-
# libdispatch and XCTest are also disabled because build-script-impl doesn't
842-
# build them for cross-compiled Android.
849+
build-swift-static-stdlib
850+
build-swift-static-sdk-overlay
851+
build-swift-stdlib-unittest-extra
852+
853+
# Path to the root of the installation filesystem.
854+
install-destdir=%(install_destdir)s
855+
856+
# Path to the .tar.gz package we would create.
857+
installable-package=%(installable_package)s
858+
859+
host-test
860+
861+
extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF
862+
863+
install-prefix=/usr
864+
install-swift
865+
install-libicu
866+
install-libcxx
867+
843868
skip-test-linux
844-
skip-build-lldb
845-
skip-build-llbuild
846-
skip-build-libdispatch
847-
skip-build-foundation
848-
skip-build-xctest
849-
skip-build-playgroundsupport
850869
skip-build-benchmarks
851-
swiftpm=0
852-
indexstore-db=0
853-
sourcekit-lsp=0
854-
toolchain-benchmarks=0
855-
test-installable-package=
856-
install-swiftpm=0
870+
skip-build-playgroundsupport
871+
872+
reconfigure
857873

858874
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,aarch64]
859875
mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build

0 commit comments

Comments
 (0)