firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue with multiple java runtimes on macOS (#52474)

Browse Source
This commit is contained in:
Mubarak Imam 2020-03-31 19:36:01 +01:00 committed by GitHub
parent c6665e43da
commit df90bb5fd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/flutter_tools/lib/src/android/android_sdk.dart
View File

@ -583,14 +583,13 @@ class AndroidSdk {
if (platform.isMacOS) { if (platform.isMacOS) {
try { try {
final String javaHomeOutput = processUtils.runSync( final String javaHomeOutput = processUtils.runSync(
<String>['/usr/libexec/java_home'], <String>['/usr/libexec/java_home', '-v', '1.8'],
throwOnError: true, throwOnError: true,
hideStdout: true, hideStdout: true,
).stdout.trim(); ).stdout.trim();
if (javaHomeOutput != null) { if (javaHomeOutput != null) {
final List<String> javaHomeOutputSplit = javaHomeOutput.split('\n'); if ((javaHomeOutput != null) && (javaHomeOutput.isNotEmpty)) {
if ((javaHomeOutputSplit != null) && (javaHomeOutputSplit.isNotEmpty)) { final String javaHome = javaHomeOutput.split('\n').last.trim();
final String javaHome = javaHomeOutputSplit[0].trim();
return fileSystem.path.join(javaHome, 'bin', 'java'); return fileSystem.path.join(javaHome, 'bin', 'java');
} }
} }

4
packages/flutter_tools/test/general.shard/android/android_sdk_test.dart
View File

@ -98,7 +98,7 @@ void main() {
.thenReturn(ProcessResult(1, 0, '26.1.1\n', '')); .thenReturn(ProcessResult(1, 0, '26.1.1\n', ''));
if (globals.platform.isMacOS) { if (globals.platform.isMacOS) {
when(globals.processManager.runSync( when(globals.processManager.runSync(
<String>['/usr/libexec/java_home'], <String>['/usr/libexec/java_home', '-v', '1.8'],
workingDirectory: anyNamed('workingDirectory'), workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'), environment: anyNamed('environment'),
)).thenReturn(ProcessResult(0, 0, '', '')); )).thenReturn(ProcessResult(0, 0, '', ''));
@ -137,7 +137,7 @@ void main() {
.thenReturn(ProcessResult(1, 1, '26.1.1\n', 'Mystery error')); .thenReturn(ProcessResult(1, 1, '26.1.1\n', 'Mystery error'));
if (globals.platform.isMacOS) { if (globals.platform.isMacOS) {
when(globals.processManager.runSync( when(globals.processManager.runSync(
<String>['/usr/libexec/java_home'], <String>['/usr/libexec/java_home', '-v', '1.8'],
workingDirectory: anyNamed('workingDirectory'), workingDirectory: anyNamed('workingDirectory'),
environment: anyNamed('environment'), environment: anyNamed('environment'),
)).thenReturn(ProcessResult(0, 0, '', '')); )).thenReturn(ProcessResult(0, 0, '', ''));