diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2020-08-04 14:34:19 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-09-08 14:52:22 +0300 |
| commit | e3600116b3321001243767ddffb1846db3de2eb9 (patch) | |
| tree | 1c4e1063b6237560f20b9253f268c8f984862655 /coin/platform_configs | |
| parent | bfe83a7ea2a415f2067a163796149f6468eda710 (diff) | |
Provisioning: Update Android ndk and build tools
Task-number: QTQAINFRA-3846
Change-Id: I5d3c0efce86e3b8bc3c6070ed4a9e438647bb955
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.yaml | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qtwebengine.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 36ff222e..45b2c437 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -55,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host linux-x86_64' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index a0864d50..d1e6cba9 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -15,4 +15,4 @@ Configurations: Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Target compiler: 'Clang' Features: ['DisableTests', 'UseLegacyInstructions'] - 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' + 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-r21d' diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index 3f266f48..f938bc94 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -45,7 +45,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host linux-x86_64' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' |