Commit Graph

31 Commits

Author SHA1 Message Date
Assam Boudjelthia
454a7f5da2 Coin: fix typo Automovie to Automotive
Change-Id: I6b650c1cd6f2d7b514ce6246da2abacfc7e7303d
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-01-20 11:45:06 +02:00
Assam Boudjelthia
8abebe23ef Coin: bump Android platform sdk and build tools version to 33
Use latest platform and build tools to be able to build for Android 13.

Pick-to: 6.5
Change-Id: I00bd9948f528d398d471e91de1d22954d786be29
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-01-20 11:45:02 +02:00
Assam Boudjelthia
b7ea626a07 Add Android 12 emulator for CI testing
Add Android 12 emulator to make sure tests are verified
on a recent Android release. Android 12 has only x64 emulator
version from sdkmanager and x86_64 is better in any case.

This patch only adds the emulator, but doesn't enable its use,
that is done under another patch.

Task-number: QTQAINFRA-4748
Task-number: QTQAINFRA-4733
Change-Id: Ic1569fb1afa5b2d02e6eadea1d9a8eac0a378d98
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-09 06:08:17 +00:00
Matti Paaso
936ede45de Update Android NDK to version r25b
Update NDK to version r25b and prebuilt openssl 1.1.1m built with
it. Change log: https://github.com/android/ndk/wiki/Changelog-r25

Task-number: QTBUG-105397
Change-Id: I501f43066e7ba8af8a57efdbee6c4a625bb80852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-17 19:47:10 +03:00
Heikki Halmet
8a72b1de99 Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-20 10:30:05 +03:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Heikki Halmet
12a87cba0a Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Pick-to: 6.3 6.2
Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-04-08 08:15:19 +00:00
Assam Boudjelthia
a4cc949b8d Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-23 19:22:22 +02:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Assam Boudjelthia
286a294daf Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.

Pick-to: 6.2
Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2021-10-29 15:08:36 +00:00
Assam Boudjelthia
d59825d250 Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-10-22 09:14:29 +02:00
Assam Boudjelthia
6ac98447b5 Coin: bump Android build tools and platform sdk level from 29 to 30
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).

Ideally, build tools should be kept up to date as well anyway.

Pick-to: 6.2 5.15
Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2021-08-26 07:54:17 +00:00
Assam Boudjelthia
53fc7d424d Update NDK to r22b
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.

Pick-to: 6.1 6.1.0
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 12:19:04 +00:00
Assam Boudjelthia
9b5c3f0a6d Android: update build tools and SDK level to 29 in CI
Pick-to: 5.15 6.0
Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-11-24 13:23:31 +02:00
Heikki Halmet
e3600116b3 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>
2020-09-08 14:52:22 +03:00
Dimitrios Apostolou
d757c6d0ec Try to catch all errors when sdkmanager installs
Task-number: QTQAINFRA-3531
Change-Id: I008c31a824287c60e67a665d0c2a3aebec863929
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:39:06 +01:00
Liang Qi
29befcc995 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml

Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
2019-10-01 11:37:07 +02:00
Dimitrios Apostolou
e6fccbf240 Remove the progress bar from the sdkmanager output
Cleans up many thousands of useless lines from the logs.

Change-Id: I2673f65b713996637d2161da4db726823e17c0df
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:11:56 +02:00
BogDan Vatra
9dd4451234 Android: Update Android NDK to version r20
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-08-22 06:55:47 +02:00
Heikki Halmet
dbaa42baa7 Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-23 06:04:34 +00:00
Heikki Halmet
c09135cb56 Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-01 11:42:49 +00:00
Juha Karjalainen
cbdd122e18 Provisioning: Update install android sdk to version 28
QT needs at least buildSdk 24 after commit
70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk
version to 28. Please note minSDK <= targetSDK <= build/compileSDK.

Task-number: QTQAINFRA-2412
Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-18 08:20:41 +00:00
Tony Sarajärvi
97efaacb2b Update Android NDK and SDK on Linux envs
Task-number: QTBUG-47672
Task-number: QTQAINFRA-2298
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:15:40 +00:00
Tony Sarajärvi
7d0c343fc6 Cleanup of RHEL 6 codes from provisioning scripts
RHEL 6 has been removed in 5.12+ verifications, so no need
to maintain those changes.

Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:01 +00:00
Joni Jantti
aeb39be740 Upgrade Android NDK to r16b and switch to clang
We need to upgrade the Android NDK version
when we switch to building with clang.

Task-number: QTQAINFRA-1681
Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-04 05:06:22 +00:00
Tony Sarajärvi
9bf79e6bab Fix shellcheck complaints in provisioning scripts
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:29 +00:00
Frederik Gladhorn
a01e7f3d40 Install an android virtual device for testing
The goal is to run tests on the AVD eventually.

Change-Id: I7ac887661497b5169c154ef8b0264ef07749a36a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-03-26 09:18:48 +00:00
Tony Sarajärvi
1c6abfae01 Remove try_catch from common linux scripts
Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:53 +00:00
Tony Sarajärvi
b4b62658ac Fix environment variable checking for proxy
Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:44 +00:00
Joni Jantti
6d1190aaa0 Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.

Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-26 13:12:41 +00:00
Heikki Halmet
2a28ce864b Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-01-10 07:58:26 +00:00