From 285249f452b22bfef06305109cbfcd8ca4ab8d02 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 15 Feb 2022 14:38:35 +0200 Subject: [PATCH] Rename the Android emulator to be more descriptive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Simo Fält (cherry picked from commit a4cc949b8dbfa2f21c323fd7cbffd011b2dbbc84) Reviewed-by: Dimitrios Apostolou --- coin/platform_configs/qtbase.yaml | 3 ++- coin/provisioning/common/linux/android_linux.sh | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index d9a39068..2079c5da 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -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}}', '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'] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 760cc597..2e81eb94 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -2,8 +2,8 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## ## 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 ## Software or, alternatively, in accordance with the terms contained in ## 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. ## ## 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..." 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 ./avdmanager list avd