From dcf26802199655b7e41d7ba8b81dbb06305f2dc1 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 24 May 2021 13:04:36 +0300 Subject: Provisioning: Install Android 11 automotive emulator This is needed after moving from internal tqtc-qt5 branches to qt5. Android 11 image was built internally. Task-number: QTQAINFRA-4343 Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b Reviewed-by: Heikki Halmet (cherry picked from commit 12a87cba0a6c42c374c6b5a4363b4eaed96a9572) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- coin/provisioning/common/linux/android_linux.sh | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 92406c67..1e8b1083 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -45,9 +45,9 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun'] Environment variables: [ '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_PROFILE=coin/conan/profiles/unix-android-x86-clang', - 'ANDROID_EMULATOR=@x86AutomotiveEmulator'] + 'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 2e81eb94..b52a24de 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -61,6 +61,12 @@ sdkApiLevel="android-31" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc" +# Android automotive +sdkApiLevelAutomovie="android-30" +androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz" +androidAutomotive="android-automotive" +android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9" + toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" ndkTargetFile="/tmp/$ndkFile" @@ -130,6 +136,15 @@ 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 emulator_x86_api_23 -k "system-images;android-23;google_apis;x86" -c 2048M -f +echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \ + -k "system-images;android-23;google_apis;x86" + +echo "Install $sdkApiLevelAutomovie $androidAutomotive" +DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \ + "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz" +sudo tar -xzf "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz" -C $sdkTargetFolder/system-images +echo "no" | ./avdmanager create avd -n automotive_emulator_x86_api_30 -c 2048M -f \ + -k "system-images;${sdkApiLevelAutomovie};${androidAutomotive};x86" + # Purely informative, show the list of avd devices ./avdmanager list avd -- cgit v1.2.3