diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-09-16 14:52:49 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-09-24 12:08:17 +0300 |
| commit | 2cec2c5f8c4521b7aef519849723b51d5de74ab8 (patch) | |
| tree | f40f89964e067be97b238f50fb86617365ad6b9d | |
| parent | f60588ee72c5d660a9f27cd56d3fc5187f1290bc (diff) | |
Add build for combined android targets
From 5.14 -> android builds are done by default at one go. Add new builds
for doing that.
Removing old, separate builds will be removed in a follow-up patch to
give time for packaging to adapt that new system
Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | coin/platform_configs/default.yaml | 8 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.yaml | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b98c451e..f15a2bc5 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -117,6 +117,14 @@ Configurations: - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -xplatform android-clang' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Clang' Target compiler: 'Clang' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index f502de7c..d813c9cd 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -53,6 +53,14 @@ - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw73' Target compiler: 'Clang' @@ -93,6 +101,14 @@ - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' |