From 21b5c7875cc39c575b14b190add676a5b96fb0b5 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 4 Jun 2020 08:17:40 +0200 Subject: [PATCH] Raise the Android SDK build requirement to lvl 28 - compile fix First of all cmake and qmake used a different standard. Secondly, the qmake logic enforced lvl 23 (if it was installed which is the case on the failing machine). When this is combined with f71a400bf61 which requires lvl 28 API to build, the android build fails to compile. cmake logic was even worse as it enforced lvl 21 API to be used if installed. This change requires pick to 5.15 as f71a400bf61 was picked as well. Pick-to: 5.15 Change-Id: I89a7193b711b8bf927d02907343a49d6f27082ce Reviewed-by: Eskil Abrahamsen Blomfeldt --- cmake/QtPlatformAndroid.cmake | 2 +- mkspecs/features/android/sdk.prf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 24360cec676..15f40f42c3b 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -40,7 +40,7 @@ function(qt_get_android_sdk_jar_for_api api out_jar_location) endfunction() # Minimum recommend android SDK api version -set(QT_ANDROID_API_VERSION "android-21") +set(QT_ANDROID_API_VERSION "android-28") # Locate android.jar set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar") diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index 3c10870bccc..463d399a21a 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ API_VERSION_TO_USE = $$(ANDROID_API_VERSION) isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION -isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-23 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-28 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) {