diff --git a/share/qtcreator/android/sdk_definitions.json b/share/qtcreator/android/sdk_definitions.json index ed1e42402f3..98cc6054edc 100644 --- a/share/qtcreator/android/sdk_definitions.json +++ b/share/qtcreator/android/sdk_definitions.json @@ -9,32 +9,28 @@ "mac_sha256": "7bc5c72ba0275c80a8f19684fb92793b83a6b5c94d4d179fc5988930282d7e64" }, "sdk_essential_packages": { - "default": ["platform-tools", "platforms;android-31", "cmdline-tools;latest"], + "default": ["platform-tools", "cmdline-tools;latest"], "linux": [], "mac": [], "windows": ["extras;google;usb_driver"] } }, "specific_qt_versions": [ - { - "versions": ["default"], - "sdk_essential_packages": ["build-tools;31.0.0", "ndk;25.1.8937393"] - }, { "versions": ["6.4"], - "sdk_essential_packages": ["build-tools;31.0.0", "ndk;23.1.7779620"] + "sdk_essential_packages": ["build-tools;31.0.0", "ndk;23.1.7779620", "platforms;android-31"] }, { "versions": ["6.3", "6.2", "5.15.[9-20]"], - "sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670"] + "sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670", "platforms;android-31"] }, { "versions": ["5.15.[0-8]", "5.14.[0-2]", "5.13.2", "6.0", "6.1"], - "sdk_essential_packages": ["build-tools;31.0.0", "ndk;21.3.6528147"] + "sdk_essential_packages": ["build-tools;31.0.0", "ndk;21.3.6528147", "platforms;android-31"] }, { "versions": ["5.12.[0-5]", "5.13.[0-1]"], - "sdk_essential_packages": ["build-tools;28.0.2", "ndk;19.2.5345600"] + "sdk_essential_packages": ["build-tools;28.0.2", "ndk;19.2.5345600", "platforms;android-28"] } ] } diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index fe433605e25..0119e55e23d 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -239,7 +239,6 @@ struct AndroidConfigData QUrl m_sdkToolsUrl; QByteArray m_sdkToolsSha256; QStringList m_commonEssentialPkgs; - SdkForQtVersions m_defaultSdkDepends; QList m_specificQtVersions; QStringList m_customNdkList; FilePath m_defaultNdk; @@ -276,7 +275,7 @@ static FilePath ndkSubPathFromQtVersion(const QtVersion &version) if (item.containsVersion(version.qtVersion())) return ndkSubPath(item); } - return ndkSubPath(config().m_defaultSdkDepends); + return {}; } ////////////////////////////////// @@ -441,10 +440,7 @@ void AndroidConfigData::parseDependenciesJson() for (const QJsonValue &pkg : versions) specificVersion.versions.append(fillQtVersionsRange(pkg.toString())); - if (itemObj[VersionsKey].toArray().first().toString() == DefaultVersionKey) - m_defaultSdkDepends = specificVersion; - else - m_specificQtVersions.append(specificVersion); + m_specificQtVersions.append(specificVersion); } } } @@ -883,16 +879,9 @@ QUrl sdkToolsUrl() { return config().m_sdkToolsUrl; } QByteArray getSdkToolsSha256() { return config().m_sdkToolsSha256; } -static QStringList defaultEssentials() +static QStringList commonEssentials() { - return config().m_defaultSdkDepends.essentialPackages + config().m_commonEssentialPkgs; -} - -static QStringList packagesExcludingBuiltWithDefaults(const QStringList &packages) -{ - return Utils::filtered(packages, [] (const QString &p) { - return !p.startsWith(ndkPackageMarker()) && !p.startsWith(platformsPackageMarker()) - && !p.startsWith(buildToolsPackageMarker()); }); + return config().m_commonEssentialPkgs; } static QString essentialBuiltWithBuildToolsPackage(int builtWithApiVersion) @@ -939,8 +928,7 @@ static QStringList essentialsFromQtVersion(const QtVersion &version) builtWithPackages.append(platformsPackageMarker() + "android-" + apiVersion); builtWithPackages.append(essentialBuiltWithBuildToolsPackage(bw.apiVersion)); - return builtWithPackages + packagesExcludingBuiltWithDefaults( - config().m_defaultSdkDepends.essentialPackages); + return builtWithPackages; } } @@ -949,7 +937,7 @@ static QStringList essentialsFromQtVersion(const QtVersion &version) if (item.containsVersion(qtVersion)) return item.essentialPackages; } - return config().m_defaultSdkDepends.essentialPackages; + return {}; } QStringList allEssentials() @@ -959,7 +947,7 @@ QStringList allEssentials() return v->targetDeviceTypes().contains(Android::Constants::ANDROID_DEVICE_TYPE); }); - QStringList allPackages(defaultEssentials()); + QStringList allPackages(commonEssentials()); for (const QtVersion *version : installedVersions) allPackages.append(essentialsFromQtVersion(*version)); allPackages.removeDuplicates();