diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-17 08:07:50 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-17 09:19:13 +0100 |
commit | 038a4a81e5c5c37fcfaccd1358eafbf1915b0894 (patch) | |
tree | 9caba20d87b02c2d14882778e8dec6e7e8a3df60 /oox/source/export | |
parent | 7b26e517d50ca4c34fa7a6291948fb200b2e5d71 (diff) |
Remove dated check for jre sub-dir in JDK
Since Java 9, a JDK installation no longer necessarily has a jre sub-dir, see
<https://docs.oracle.com/javase/9/install/
installed-directory-structure-jdk-and-jre.htm> vs.
<https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jdkfiles.html>.
The check for a jre sub-dir had been there ever since
157d22babb277a9e7bc750a74737cd60e84dfee8 "INTEGRATION: CWS rodarvus01", but the
code that determines a working JAVA_HOME has been improved a lot since then.
Given that the current check can be misleading (see
<https://lists.freedesktop.org/archives/libreoffice/2019-December/084005.html>
"Re: what jdk for build?"), better remove it completely and hope that the code
determining a working JAVA_HOME is good enough by now.
Change-Id: Ib1da3c00b8a3f1e54d5204e6ecd43b4c4441c827
Reviewed-on: https://gerrit.libreoffice.org/85257
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox/source/export')
0 files changed, 0 insertions, 0 deletions