Android: Remove default platform SDK requirements

Certain Android SDK and NDK version combinations are well tested by Qt.
However, these combinations are included in a Qt installation from 6.5,
so the default suggestion is removed to avoid Creator giving a bad or
outdated suggestion on what NDK to install. Connected parsing and
processing code is also removed.

Fixes: QTCREATORBUG-31311
Task-number: QTCREATORBUG-30404
Change-Id: Ie0fc6cc71e9ec1a720b6182bffc97da996366c4c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

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"]
         }
     ]
 }

src/plugins/android/androidconfigurations.cpp

@@ -239,7 +239,6 @@ struct AndroidConfigData
     QUrl m_sdkToolsUrl;
     QByteArray m_sdkToolsSha256;
     QStringList m_commonEssentialPkgs;
-    SdkForQtVersions m_defaultSdkDepends;
     QList<SdkForQtVersions> 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,9 +440,6 @@ 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);
         }
     }
@@ -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;
+    return 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()); });
 }
 
 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(
+            return builtWithPackages;
-                       config().m_defaultSdkDepends.essentialPackages);
         }
     }
 
@@ -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();