feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Set ANDROID_HOME environment variable

Browse Source 
Task-number: QTCREATORBUG-9424

Change-Id: Iba4a9663a8fa39160f1953366ae4aa64d5f586ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-06-04 17:57:57 +02:00
parent 970f6a8035
commit 4174246b69
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androidtoolchain.cpp
View File

@@ -116,6 +116,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
QString javaHome = AndroidConfigurations::instance().openJDKPath().toString(); QString javaHome = AndroidConfigurations::instance().openJDKPath().toString();
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());
} }
bool AndroidToolChain::operator ==(const ToolChain &tc) const bool AndroidToolChain::operator ==(const ToolChain &tc) const