From 9f2f41e285ee8c262d0cfaa950f13ed0c70d09eb Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 9 Sep 2015 16:40:12 +0200 Subject: [PATCH] Android: Support non distro installations of JDK The android tools expect to find java and javac in the PATH. Which is the case on using the distro java, but isn't if the user installs Oracle's binary jdk distribution. Change-Id: Ib5f5448724f00b000a969c27d5aad6a420bfc1eb Task-number: QTCREATORBUG-14155 Reviewed-by: BogDan Vatra --- src/plugins/android/androidconfigurations.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 5fed6179d7e..79d41932ff8 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -471,8 +471,12 @@ FileName AndroidConfig::adbToolPath() const Environment AndroidConfig::androidToolEnvironment() const { Environment env = Environment::systemEnvironment(); - if (!m_openJDKLocation.isEmpty()) + if (!m_openJDKLocation.isEmpty()) { env.set(QLatin1String("JAVA_HOME"), m_openJDKLocation.toUserOutput()); + Utils::FileName binPath = m_openJDKLocation; + binPath.appendPath(QLatin1String("bin")); + env.prependOrSetPath(binPath.toUserOutput()); + } return env; }