lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 11:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename the Android emulator to be more descriptive

Browse Source 
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
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a4cc949b8d)
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
This commit is contained in:
Assam Boudjelthia
2022-02-15 14:38:35 +02:00
parent 6f0e2bb5f2
commit 285249f452
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/platform_configs/qtbase.yaml
View File

@@ -19,6 +19,7 @@ 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}}', '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_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_INSTALL_DIR={{.InstallDir}}/target', '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']

8
coin/provisioning/common/linux/android_linux.sh
View File

@@ -2,8 +2,8 @@
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2022 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: https://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
## ##
@@ -13,7 +13,7 @@
## accordance with the commercial license agreement provided with the ## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in ## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms ## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further ## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us. ## information use the contact form at http://www.qt.io/contact-us.
## ##
## GNU Lesser General Public License Usage ## GNU Lesser General Public License Usage
@@ -130,6 +130,6 @@ echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
echo "Checking the contents of Android SDK again..." echo "Checking the contents of Android SDK again..."
ls -l "$sdkTargetFolder" ls -l "$sdkTargetFolder"
echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-23;google_apis;x86" -c 2048M -f echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -k "system-images;android-23;google_apis;x86" -c 2048M -f
# Purely informative, show the list of avd devices # Purely informative, show the list of avd devices
./avdmanager list avd ./avdmanager list avd