mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-24 23:32:36 +08:00
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>
This commit is contained in:
@@ -19,5 +19,6 @@ Configurations:
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
|
||||
'CONAN_INSTALL_DIR={{.InstallDir}}/target',
|
||||
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang']
|
||||
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
|
||||
'ANDROID_EMULATOR=@emulator_x86_api_23']
|
||||
|
||||
|
||||
Reference in New Issue
Block a user