Enable targetting AOTC Android builds from Mac hosts. (flutter#3911)

chinmaygarde · chinmaygarde · commit a21dedc16f22 · 2016-05-13T17:03:03.000-07:00
diff --git a/bin/cache/engine.version b/bin/cache/engine.version
@@ -1 +1 @@
-57edc534d69031b03409e7af37cbc492cb135086
+a1f4a12baa3dd4382e395743ff16ffbe3d188b88
diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart
@@ -35,9 +35,9 @@ enum HostPlatform {
 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 @@ enum TargetPlatform {
 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
@@ -220,7 +220,11 @@ class FlutterEngine {
   // 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'],

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-57edc534d69031b03409e7af37cbc492cb135086`
	`1`	`+a1f4a12baa3dd4382e395743ff16ffbe3d188b88`