github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-24 01:52:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: detect JAVA_HOME with Java 11 (#1406)

Browse Source
This commit is contained in:
Lars Mikkelsen 2022-03-17 19:38:04 -04:00 committed by GitHub
parent 6d3ce211dd
commit 112f0a61a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/env/java.js vendored
View File

@ -99,7 +99,8 @@ const java = {
} else { } else {
// See if we can derive it from javac's location. // See if we can derive it from javac's location.
var maybeJavaHome = path.dirname(path.dirname(javacPath)); var maybeJavaHome = path.dirname(path.dirname(javacPath));
if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) { if (fs.existsSync(path.join(maybeJavaHome, 'bin', 'java')) ||
fs.existsSync(path.join(maybeJavaHome, 'bin', 'java.exe'))) {
environment.JAVA_HOME = maybeJavaHome; environment.JAVA_HOME = maybeJavaHome;
} else { } else {
throw new CordovaError(default_java_error_msg); throw new CordovaError(default_java_error_msg);