Skip to content
Snippets Groups Projects
Commit bc3b0859 authored by Daniel Teske's avatar Daniel Teske
Browse files

Android: Set ANDROID_SDK_ROOT environment variable


Needed by androiddeployqt

Task-number: QTCREATORBUG-10289

Change-Id: I64abef7278fab5c9261f9f954af416410f69ce0d
Reviewed-by: default avatarEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
parent 1c5cd2c1
No related branches found
No related tags found
No related merge requests found
...@@ -124,6 +124,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const ...@@ -124,6 +124,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
if (!javaHome.isEmpty() && QFileInfo(javaHome).exists()) if (!javaHome.isEmpty() && QFileInfo(javaHome).exists())
env.set(QLatin1String("JAVA_HOME"), javaHome); env.set(QLatin1String("JAVA_HOME"), javaHome);
env.set(QLatin1String("ANDROID_HOME"), AndroidConfigurations::instance().config().sdkLocation.toString()); 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 bool AndroidToolChain::operator ==(const ToolChain &tc) const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment