diff options
Diffstat (limited to 'src/plugins/android/androidtoolchain.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 6e3ba77b68..a05cba4a18 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -115,6 +115,9 @@ void AndroidToolChain::addToEnvironment(Environment &env) const env.set(QLatin1String("ANDROID_NDK_TOOLCHAIN_PREFIX"), AndroidConfigurations::toolchainPrefix(targetAbi().architecture())); env.set(QLatin1String("ANDROID_NDK_TOOLS_PREFIX"), AndroidConfigurations::toolsPrefix(targetAbi().architecture())); env.set(QLatin1String("ANDROID_NDK_TOOLCHAIN_VERSION"), m_ndkToolChainVersion); + QString javaHome = AndroidConfigurations::instance().openJDKPath().toString(); + if (!javaHome.isEmpty() && QFileInfo(javaHome).exists()) + env.set(QLatin1String("JAVA_HOME"), javaHome); } bool AndroidToolChain::operator ==(const ToolChain &tc) const |