github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert #8332 (#8386)

Browse Source 
The JDK doesn't put `javac` in the PATH on Windows :(
This commit is contained in:
Michael Goderbauer 2017-02-23 17:35:20 -08:00 committed by GitHub
parent a002e72022
commit 718859ad8d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter_tools/lib/src/android/android_workflow.dart
View File

@ -70,11 +70,14 @@ class AndroidWorkflow extends DoctorValidator implements Workflow {
String javaVersion;
try {
printTrace('javac -version');
printTrace('java -version');
ProcessResult result = processManager.runSync(<String>['javac', '-version']);
if (result.exitCode == 0)
javaVersion = result.stderr.split('\n')[0];
ProcessResult result = processManager.runSync(<String>['java', '-version']);
if (result.exitCode == 0) {
javaVersion = result.stderr;
List<String> versionLines = javaVersion.split('\n');
javaVersion = versionLines.length >= 2 ? versionLines[1] : versionLines[0];
}
} catch (error) {
}
@ -83,7 +86,7 @@ class AndroidWorkflow extends DoctorValidator implements Workflow {
'No Java Development Kit (JDK) found; you can download the JDK from $_kJdkDownload.'
));
} else {
messages.add(new ValidationMessage('Java Development Kit (JDK) found: $javaVersion'));
messages.add(new ValidationMessage(javaVersion));
type = ValidationType.installed;
}
} else {