diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 4daaa913..02006ba3 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -63,3 +63,20 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_64_api_34' ] +- + Id: 'android-15-x86_64-on-linux' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Environment variables: [ + '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_64', + '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}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_EMULATOR=emulator_x86_64_api_35' + ] + diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 7fb7bf08..a90b621b 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -150,6 +150,9 @@ rm "$emulatorTargetFile" echo "y" | ./sdkmanager --install "system-images;android-28;google_apis;x86" \ | eval "$sdkmanager_no_progress_bar_cmd" +echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \ + | eval "$sdkmanager_no_progress_bar_cmd" + echo "Extract stored Android 14 Beta $android14SystemZipName" DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \ "/tmp/$android14SystemZipName" @@ -164,6 +167,9 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \ echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \ -k "system-images;android-34;google_apis;x86_64" +echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \ + -k "system-images;android-35;google_apis;x86_64" + echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax" DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \ "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"