diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-06-10 18:18:38 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-06-14 13:13:12 +0200 |
| commit | cb6eaa3c2435128392d5ef7bd98e26902d086ece (patch) | |
| tree | 610b145f61f3472ef1a405b580dfb23ee6d3e90d /src/plugins/android/androidmanager.cpp | |
| parent | 8127ebe244c9c6a2561e592e2ed550d7b6d67115 (diff) | |
Android: Set JAVA_HOME in environment and use that environment
Change-Id: Ia0f3abad74b7ac423fab621ca22e0f698747c477
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index ed2fb8d10f..4761b68db4 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -611,9 +611,14 @@ void AndroidManager::updateTarget(ProjectExplorer::Target *target, const QString { QString androidDir = dirPath(target).toString(); + Utils::Environment env = Utils::Environment::systemEnvironment(); + QString javaHome = AndroidConfigurations::instance().config().openJDKLocation.toString(); + if (!javaHome.isEmpty()) + env.set(QLatin1String("JAVA_HOME"), javaHome); // clean previous build QProcess androidProc; androidProc.setWorkingDirectory(androidDir); + androidProc.setProcessEnvironment(env.toProcessEnvironment()); androidProc.start(AndroidConfigurations::instance().antToolPath().toString(), QStringList() << QLatin1String("clean")); if (!androidProc.waitForFinished(-1)) |