From bc3b0859bb3ca56e7017681a4b7703629044bbf6 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 2 Oct 2013 11:49:35 +0200
Subject: [PATCH] Android: Set ANDROID_SDK_ROOT environment variable
Needed by androiddeployqt
Task-number: QTCREATORBUG-10289
Change-Id: I64abef7278fab5c9261f9f954af416410f69ce0d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
src/plugins/android/androidtoolchain.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 1b3bd7260bd..d65c36a48e5 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -124,6 +124,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
if (!javaHome.isEmpty() && QFileInfo(javaHome).exists())
env.set(QLatin1String("JAVA_HOME"), javaHome);
env.set(QLatin1String("ANDROID_HOME"), AndroidConfigurations::instance().config().sdkLocation.toString());
+ env.set(QLatin1String("ANDROID_SDK_ROOT"), AndroidConfigurations::instance().config().sdkLocation.toString());
}
bool AndroidToolChain::operator ==(const ToolChain &tc) const
--
GitLab