mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-02 03:37:10 +08:00
COIN/Android: Use -avd param to avoid appending '@' to AVD name
Using -avd emulator param saves us from using the '@' character at the start of the name (which I didn't do few times, and was faced with an unresponsive emulator and not immediately seeing the problem in a debug vm). Task-number: QTQAINFRA-5596 Change-Id: I3863dc312fd33dae78eeb3dd02f5fb16ca79d72b Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
@@ -14,7 +14,7 @@ Configurations:
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
|
||||
'ANDROID_EMULATOR=@emulator_x86_api_23']
|
||||
'ANDROID_EMULATOR=emulator_x86_api_23']
|
||||
-
|
||||
Id: 'android-x86-developer-build-testrun-on-linux'
|
||||
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
|
||||
@@ -29,4 +29,4 @@ Configurations:
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
|
||||
'ANDROID_EMULATOR=@emulator_x86_api_23']
|
||||
'ANDROID_EMULATOR=emulator_x86_api_23']
|
||||
|
||||
Reference in New Issue
Block a user