[flutter_releases] Flutter 1.23.0-18.1.pre Framework Cherrypicks (#68168)
* Update engine hash to 1.23.0-18.1.pre
* [flutter_tools] support Android Studio 4.1 on Windows (#67992)
Android Studio 4.1 moved the location of the .home file on Windows which is used to located the install directory. This functionality is important because it is how we locate and discover the Android SDK functionality, as well as the appropriate JRE.
fixes #67986
Co-authored-by: Jonah Williams <jonahwilliams@google.com>
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 332df4e..1e0fb58 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-66344068899635154addec16005167113b9c1e9d
+1d12d82d9cb54876f58044aa52198d53ec841c3d
diff --git a/packages/flutter_tools/lib/src/android/android_studio.dart b/packages/flutter_tools/lib/src/android/android_studio.dart
index eb07945..a7f6540 100644
--- a/packages/flutter_tools/lib/src/android/android_studio.dart
+++ b/packages/flutter_tools/lib/src/android/android_studio.dart
@@ -260,6 +260,29 @@
}
}
}
+ // 4.1 has a different location for AndroidStudio installs on Windows.
+ if (globals.platform.isWindows) {
+ final File homeDot = globals.fs.file(globals.fs.path.join(
+ globals.platform.environment['LOCALAPPDATA'],
+ 'Google',
+ 'AndroidStudio4.1',
+ '.home',
+ ));
+ if (homeDot.existsSync()) {
+ final String installPath = homeDot.readAsStringSync();
+ if (globals.fs.isDirectorySync(installPath)) {
+ final AndroidStudio studio = AndroidStudio(
+ installPath,
+ version: Version(4, 1, 0),
+ studioAppName: 'Android Studio 4.1',
+ );
+ if (studio != null && !_hasStudioAt(studio.directory, newerThan: studio.version)) {
+ studios.removeWhere((AndroidStudio other) => other.directory == studio.directory);
+ studios.add(studio);
+ }
+ }
+ }
+ }
final String configuredStudioDir = globals.config.getValue('android-studio-dir') as String;
if (configuredStudioDir != null && !_hasStudioAt(configuredStudioDir)) {
diff --git a/packages/flutter_tools/test/general.shard/android/android_studio_test.dart b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart
index 0041995..d4bd7a2 100644
--- a/packages/flutter_tools/test/general.shard/android/android_studio_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart
@@ -6,6 +6,7 @@
import 'package:flutter_tools/src/android/android_studio.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/platform.dart';
+import 'package:flutter_tools/src/base/version.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:flutter_tools/src/ios/plist_parser.dart';
import 'package:mockito/mockito.dart';
@@ -33,6 +34,13 @@
environment: <String, String>{'HOME': homeLinux},
);
+final Platform windowsPlatform = FakePlatform(
+ operatingSystem: 'windows',
+ environment: <String, String>{
+ 'LOCALAPPDATA': 'C:\\Users\\Dash\\AppData\\Local',
+ }
+);
+
class MockPlistUtils extends Mock implements PlistParser {}
Platform macPlatform() {
@@ -177,4 +185,28 @@
PlistParser: () => plistUtils,
});
});
+
+ FileSystem windowsFileSystem;
+
+ setUp(() {
+ windowsFileSystem = MemoryFileSystem.test(style: FileSystemStyle.windows);
+ });
+
+ testUsingContext('Can discover Android Studio 4.1 location on Windows', () {
+ windowsFileSystem.file('C:\\Users\\Dash\\AppData\\Local\\Google\\AndroidStudio4.1\\.home')
+ ..createSync(recursive: true)
+ ..writeAsStringSync('C:\\Program Files\\AndroidStudio');
+ windowsFileSystem
+ .directory('C:\\Program Files\\AndroidStudio')
+ .createSync(recursive: true);
+
+ final AndroidStudio studio = AndroidStudio.allInstalled().single;
+
+ expect(studio.version, Version(4, 1, 0));
+ expect(studio.studioAppName, 'Android Studio 4.1');
+ }, overrides: <Type, Generator>{
+ Platform: () => windowsPlatform,
+ FileSystem: () => windowsFileSystem,
+ ProcessManager: () => FakeProcessManager.any(),
+ });
}
