Skip to content

Commit 983d9ac

Browse files
authored
Merge pull request #16557 from AndrewSB/android-preset
[WIP] [Preset] Add linux crosscompile android preset
2 parents 79d5388 + f43f5cb commit 983d9ac

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

utils/build-presets.ini

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,27 @@ skip-test-libdispatch
781781
skip-test-playgroundsupport
782782
skip-test-libicu
783783

784+
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
785+
mixin-preset=buildbot_linux
786+
787+
release
788+
assertions
789+
790+
dash-dash
791+
792+
android
793+
android-ndk=%(ndk_path)s
794+
android-api-level=21
795+
android-icu-uc=%(arm_dir)s/libicuucswift.so
796+
android-icu-uc-include=%(arm_dir)s/icu/source/common
797+
android-icu-i18n=%(arm_dir)s/libicui18nswift.so
798+
android-icu-i18n-include=%(arm_dir)s/icu/source/i18n
799+
784800
# Ubuntu 18.04 preset for backwards compat and future customizations.
785801
[preset: buildbot_linux_1804]
786802
mixin-preset=buildbot_linux
787803

804+
788805
# Ubuntu 16.10 preset for backwards compat and future customizations.
789806
[preset: buildbot_linux_1610]
790807
mixin-preset=buildbot_linux

utils/build_swift/tests/test_presets.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
'installable_package': '/tmp/install/pkg',
4141
'swift_install_destdir': '/tmp/install/swift',
4242
'symbols_package': '/path/to/symbols/package',
43+
'ndk_path': '/path/to/ndk',
44+
'arm_dir': '/path/to/arm',
4345
}
4446

4547
SAMPLE_PRESET = """

0 commit comments

Comments
 (0)