Merge remote-tracking branch 'origin/4.5'

Change-Id: Iebd340258966aff910fb9ab0e45b5149e8f242f0

1 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index e3a648c8b4..e3dab7ad7b 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -29,6 +29,7 @@
 #include "androidconfigurations.h"
 #include "androidconstants.h"
 #include "androidmanager.h"
+#include "androidsdkmanager.h"
 #include "androidqtsupport.h"
 #include "certificatesmodel.h"
 
@@ -92,7 +93,8 @@ private:
 
 AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, const Core::Id id)
     : ProjectExplorer::AbstractProcessStep(parent, id),
-      m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::currentConfig().highestAndroidSdk()))
+      m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
+                                         sdkManager()->latestAndroidSdkPlatform()))
 {
     //: AndroidBuildApkStep default display name
     setDefaultDisplayName(tr("Build Android APK"));
@@ -233,8 +235,10 @@ bool AndroidBuildApkStep::fromMap(const QVariantMap &map)
     m_keystorePath = Utils::FileName::fromString(map.value(KeystoreLocationKey).toString());
     m_signPackage = false; // don't restore this
     m_buildTargetSdk = map.value(BuildTargetSdkKey).toString();
-    if (m_buildTargetSdk.isEmpty())
-        m_buildTargetSdk = AndroidConfig::apiLevelNameFor(AndroidConfigurations::currentConfig().highestAndroidSdk());
+    if (m_buildTargetSdk.isEmpty()) {
+        m_buildTargetSdk = AndroidConfig::apiLevelNameFor(AndroidConfigurations::
+                                                          sdkManager()->latestAndroidSdkPlatform());
+    }
     m_verbose = map.value(VerboseOutputKey).toBool();
     m_useMinistro = map.value(UseMinistroKey).toBool();
     return ProjectExplorer::BuildStep::fromMap(map);