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>

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -44,8 +44,8 @@ Configurations:
         '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',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
+        'ANDROID_EMULATOR=emulator_x86_api_23'
     ]
 -
     Id: 'android-6-RHEL-8.8-x86-on-linux'
@@ -60,8 +60,8 @@ Configurations:
         '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',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
+        'ANDROID_EMULATOR=emulator_x86_api_23'
     ]
 -
     Id: 'android-13-x86_64-on-linux'
@@ -77,7 +77,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}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
+        'ANDROID_EMULATOR=emulator_x86_64_api_33'
     ]
 -
     Id: 'android-13-RHEL-8.8-x86_64-on-linux'
@@ -93,5 +93,5 @@ Configurations:
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
+        'ANDROID_EMULATOR=emulator_x86_64_api_33'
     ]

coin/platform_configs/linux_android_tests_developer.yaml

@@ -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']

coin/platform_configs/tqtc-android-automotive.yaml

@@ -31,7 +31,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=@automotive_emulator_x86_64_api_31'
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_31'
     ]
 -
     Id: "automotive-android-12-x86_64-on-linux"
@@ -47,5 +47,5 @@ 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=@automotive_emulator_x86_64_api_31'
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_31'
     ]

coin/provisioning/common/linux/android_emulator_launcher.sh

@@ -12,12 +12,11 @@ EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator"
 ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb"
 if [ -z "${ANDROID_EMULATOR}" ]
 then
-    EMULATOR_NAME="@emulator_x86_api_23"
+    EMULATOR_NAME="emulator_x86_api_23"
 else
     EMULATOR_NAME="$ANDROID_EMULATOR"
 fi
 
-
 function check_for_android_device
 {
     $ADB_EXEC devices \
@@ -59,7 +58,7 @@ do
     fi
 
     echo "Starting emulator, try ${counter}/${EMULATOR_MAX_RETRIES}"
-    $EMULATOR_EXEC $EMULATOR_NAME  \
+    $EMULATOR_EXEC -avd $EMULATOR_NAME  \
         -gpu swiftshader_indirect -no-audio -partition-size 4096  \
         -cores 4 -memory 16000 -no-snapshot-load -no-snapshot-save \
         </dev/null  >$HOME/emulator.log 2>&1  &