lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 01:36:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert back to use RHEL 8.4 with Android targets

Browse Source 
RHEL-9 is causing problems in QtApplicationmanager when using
RHEL-8.4 as a host build: It can't load libcrypto in Android
build phase

Pick-to: dev 6.4
Task-number: QTBUG-110172
Change-Id: I6d5ef4684fb11e384eb54f9a37bd30e4ef8d145b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Heikki Halmet
2023-01-20 06:03:34 +00:00
parent 6f1b182a6d
commit 7ac39979ce
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/cmake_platforms_target_android.yaml
View File

@@ -37,7 +37,7 @@ Configurations:
]
-
Id: 'android-x86-on-linux'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
@@ -55,7 +55,7 @@ Configurations:
]
-
Id: 'android-x86_64-on-linux'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'

2
coin/platform_configs/cmake_platforms_target_android_12.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'android-12-x86_64-on-linux'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'

2
coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
View File

@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'

2
coin/platform_configs/linux_android_tests_developer.yaml
View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'android-x86-developer-build-testrun-on-linux'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'

4
coin/platform_configs/linux_android_tests_multi_abi.yaml
View File

@@ -1,8 +1,8 @@
Version: 2
Configurations:
-
Id: 'rhel_9.0_android_multi'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Id: 'rhel_8.4_android_multi'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'GCC'

8
coin/platform_configs/tqtc-android-automotive.yaml
View File

@@ -33,8 +33,8 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
-
Id: 'rhel-9.0'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Id: 'rhel-8.4'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
@@ -44,12 +44,12 @@ Configurations:
]
-
Id: "automotive-android-x86-on-linux"
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-9.0'
Platform dependency: 'rhel-8.4'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',