diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-12 13:44:30 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-04 18:39:03 +0100 |
| commit | 7b9bb698b93e747e02bf6ab8310c439867318f8e (patch) | |
| tree | 1df5da317bbd171f1a6afee4d7daffe3292f02f1 /coin/instructions/prepare_building_env.yaml | |
| parent | 8d76c5af518599800657ab40d56df4dfbc0a0e85 (diff) | |
Add support of Android multi-ABI builds
This patchset adds the rules to utilize build artifacts from multiple
android abi builds and to use them for building and running tests.
If target.arch has the value 'Multi', coin will now skip building Qt
itself, since this means that all Qt versions were build previously.
It only builds test using the pre-built Qt for Android archives and
then runs the regular Android tests using multi-ABI apks. The rules
are implemented for qtbase only.
Change-Id: I265c70c45caa2155c75cd15c7e3a4f6a863252b8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin/instructions/prepare_building_env.yaml')
| -rw-r--r-- | coin/instructions/prepare_building_env.yaml | 56 |
1 files changed, 41 insertions, 15 deletions
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index a94a42c3e2..f816ef56ea 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -26,21 +26,6 @@ instructions: property: host.os equals_value: Windows - - type: EnvironmentVariable - variableName: LIBEXEC_INSTALL_DIR - variableValue: "{{.InstallDir}}\\bin\\" - enable_if: - condition: property - property: host.os - equals_value: Windows - - type: EnvironmentVariable - variableName: LIBEXEC_INSTALL_DIR - variableValue: "{{.InstallDir}}/libexec/" - disable_if: - condition: property - property: host.os - equals_value: Windows - # Export ICC specific env. variables - type: Group instructions: @@ -553,3 +538,44 @@ instructions: - condition: property property: host.os contains_value: Windows + + - type: EnvironmentVariable + variableName: HOST_INSTALL_DIR + variableValue: "{{$android_host_artifact_path := index .Env \"QT_CI_ARTIFACT_ID_PATH_Android-host\" }}{{index .Env $android_host_artifact_path}}/install" + enable_if: + condition: and + conditions: + - condition: property + property: target.osVersion + equals_value: Android_ANY + - condition: property + property: target.arch + equals_value: Multi + + - type: EnvironmentVariable + variableName: HOST_INSTALL_DIR + variableValue: "{{.InstallDir}}" + disable_if: + condition: and + conditions: + - condition: property + property: target.osVersion + equals_value: Android_ANY + - condition: property + property: target.arch + equals_value: Multi + + - type: EnvironmentVariable + variableName: LIBEXEC_INSTALL_DIR + variableValue: "{{.Env.HOST_INSTALL_DIR}}\\bin\\" + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: EnvironmentVariable + variableName: LIBEXEC_INSTALL_DIR + variableValue: "{{.Env.HOST_INSTALL_DIR}}/libexec/" + disable_if: + condition: property + property: host.os + equals_value: Windows |