Enable targetting AOTC Android builds from Mac hosts. (#3911)
diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart
index 3224a61..e6e6a7d 100644
--- a/packages/flutter_tools/lib/src/build_info.dart
+++ b/packages/flutter_tools/lib/src/build_info.dart
@@ -35,9 +35,9 @@
String getNameForHostPlatform(HostPlatform platform) {
switch (platform) {
case HostPlatform.darwin_x64:
- return "mac_debug";
+ return 'darwin-x64';
case HostPlatform.linux_x64:
- return "linux-x64";
+ return 'linux-x64';
}
assert(false);
}
@@ -54,17 +54,17 @@
String getNameForTargetPlatform(TargetPlatform platform) {
switch (platform) {
case TargetPlatform.android_arm:
- return "android-arm";
+ return 'android-arm';
case TargetPlatform.android_x64:
- return "android-x64";
+ return 'android-x64';
case TargetPlatform.android_x86:
- return "android-x86";
+ return 'android-x86';
case TargetPlatform.ios:
- return "ios_release";
+ return 'ios_release';
case TargetPlatform.darwin_x64:
- return "mac_debug";
+ return 'darwin-x64';
case TargetPlatform.linux_x64:
- return "linux-x64";
+ return 'linux-x64';
}
assert(false);
}
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
index 791c1ea..1ca3035 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
@@ -220,7 +220,11 @@
// Return a list of (cache directory path, download URL path) tuples.
List<List<String>> _getToolsDirs() {
if (Platform.isMacOS)
- return <List<String>>[<String>['mac_debug', 'mac_debug/artifacts.zip']];
+ return <List<String>>[
+ <String>['darwin-x64', 'darwin-x64/artifacts.zip'],
+ <String>['android-arm-profile/darwin-x64', 'android-arm-profile/darwin-x64.zip'],
+ <String>['android-arm-release/darwin-x64', 'android-arm-release/darwin-x64.zip'],
+ ];
else if (Platform.isLinux)
return <List<String>>[
<String>['linux-x64', 'linux-x64/artifacts.zip'],
