From 54f76d29c0d8996e3e906c0abf4182c806febe42 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 14 Apr 2020 19:48:33 +0300
Subject: [PATCH] Android: fix sdkmanager not picking up all marked essential
 packages

Task-number: QTCREATORBUG-23829
Change-Id: Id436c96a8b9376d10ada92412c154c5aea2a294b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/android/androidsdkmodel.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp
index 7e18b19ff4a..b2dce193c59 100644
--- a/src/plugins/android/androidsdkmodel.cpp
+++ b/src/plugins/android/androidsdkmodel.cpp
@@ -285,14 +285,9 @@ void AndroidSdkModel::selectMissingEssentials()
         if (!pendingPkgs.contains((*tool)->sdkStylePath()))
             continue;
 
-        if ((*tool)->type() == AndroidSdkPackage::PlatformToolsPackage)
-            addTool(tool); // Select Platform tools
-        else if ((*tool)->type() == AndroidSdkPackage::BuildToolsPackage)
-            addTool(tool); // Select build tools
-        else if ((*tool)->type() == AndroidSdkPackage::NDKPackage)
-            addTool(tool); // Select NDK Bundle
-
+        addTool(tool);
         pendingPkgs.removeOne((*tool)->sdkStylePath());
+
         if (pendingPkgs.isEmpty())
             break;
     }