Skip to content

Update buildbot_linux_crosscompile_android preset #78013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions utils/build-presets.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand All @@ -1026,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
Expand Down