Merge pull request #2821 from chinmaygarde/master

Dont differentiate between ios_arm and ios_x64 in flutter_tools

packages/flutter_tools/lib/src/application_package.dart

@@ -110,8 +110,7 @@ class ApplicationPackageStore {
     switch (platform) {
       case TargetPlatform.android_arm:
         return android;
-      case TargetPlatform.ios_arm:
-      case TargetPlatform.ios_x64:
+      case TargetPlatform.ios:
         return iOS;
       case TargetPlatform.darwin_x64:
       case TargetPlatform.linux_x64:
@@ -130,8 +129,7 @@ class ApplicationPackageStore {
           android = new AndroidApk.fromBuildConfiguration(config);
           break;
 
-        case TargetPlatform.ios_arm:
-        case TargetPlatform.ios_x64:
+        case TargetPlatform.ios:
           iOS ??= new IOSApp.fromBuildConfiguration(config);
           break;
 

packages/flutter_tools/lib/src/artifacts.dart

@@ -25,10 +25,8 @@ String getNameForTargetPlatform(TargetPlatform platform) {
   switch (platform) {
     case TargetPlatform.android_arm:
       return 'android-arm';
-    case TargetPlatform.ios_arm:
-      return 'ios-arm';
-    case TargetPlatform.ios_x64:
-      return 'ios-x64';
+    case TargetPlatform.ios:
+      return 'ios';
     case TargetPlatform.darwin_x64:
       return 'darwin-x64';
     case TargetPlatform.linux_x64:

packages/flutter_tools/lib/src/build_configuration.dart

@@ -21,8 +21,7 @@ enum HostPlatform {
 
 enum TargetPlatform {
   android_arm,
-  ios_arm,
-  ios_x64,
+  ios,
   darwin_x64,
   linux_x64
 }

packages/flutter_tools/lib/src/commands/run.dart

@@ -137,8 +137,7 @@ String _getMissingPackageHintForPlatform(TargetPlatform platform) {
   switch (platform) {
     case TargetPlatform.android_arm:
       return 'Is your project missing an android/AndroidManifest.xml?';
-    case TargetPlatform.ios_arm:
-    case TargetPlatform.ios_x64:
+    case TargetPlatform.ios:
       return 'Is your project missing an ios/Info.plist?';
     default:
       return null;

packages/flutter_tools/lib/src/ios/devices.dart

@@ -229,7 +229,7 @@ class IOSDevice extends Device {
   }
 
   @override
-  TargetPlatform get platform => TargetPlatform.ios_arm;
+  TargetPlatform get platform => TargetPlatform.ios;
 
   @override
   DeviceLogReader get logReader {

packages/flutter_tools/lib/src/ios/simulators.dart

@@ -573,7 +573,7 @@ class IOSSimulator extends Device {
   }
 
   @override
-  TargetPlatform get platform => TargetPlatform.ios_x64;
+  TargetPlatform get platform => TargetPlatform.ios;
 
   @override
   DeviceLogReader get logReader {

packages/flutter_tools/lib/src/runner/flutter_command_runner.dart

@@ -286,12 +286,7 @@ class FlutterCommandRunner extends CommandRunner {
       if (hostPlatform == HostPlatform.mac) {
         configs.add(new BuildConfiguration.prebuilt(
           hostPlatform: HostPlatform.mac,
-          targetPlatform: TargetPlatform.ios_arm
-        ));
-
-        configs.add(new BuildConfiguration.prebuilt(
-          hostPlatform: HostPlatform.mac,
-          targetPlatform: TargetPlatform.ios_x64
+          targetPlatform: TargetPlatform.ios
         ));
       }
     } else {
@@ -323,7 +318,7 @@ class FlutterCommandRunner extends CommandRunner {
           configs.add(new BuildConfiguration.local(
             type: BuildType.debug,
             hostPlatform: hostPlatform,
-            targetPlatform: TargetPlatform.ios_arm,
+            targetPlatform: TargetPlatform.ios,
             enginePath: enginePath,
             buildPath: globalResults['ios-debug-build-path']
           ));
@@ -331,7 +326,7 @@ class FlutterCommandRunner extends CommandRunner {
           configs.add(new BuildConfiguration.local(
             type: BuildType.debug,
             hostPlatform: hostPlatform,
-            targetPlatform: TargetPlatform.ios_x64,
+            targetPlatform: TargetPlatform.ios,
             enginePath: enginePath,
             buildPath: globalResults['ios-sim-debug-build-path']
           ));
@@ -360,7 +355,7 @@ class FlutterCommandRunner extends CommandRunner {
           configs.add(new BuildConfiguration.local(
             type: BuildType.release,
             hostPlatform: hostPlatform,
-            targetPlatform: TargetPlatform.ios_arm,
+            targetPlatform: TargetPlatform.ios,
             enginePath: enginePath,
             buildPath: globalResults['ios-release-build-path']
           ));
@@ -368,7 +363,7 @@ class FlutterCommandRunner extends CommandRunner {
           configs.add(new BuildConfiguration.local(
             type: BuildType.release,
             hostPlatform: hostPlatform,
-            targetPlatform: TargetPlatform.ios_x64,
+            targetPlatform: TargetPlatform.ios,
             enginePath: enginePath,
             buildPath: globalResults['ios-sim-release-build-path']
           ));

packages/flutter_tools/test/src/mocks.dart

@@ -45,7 +45,7 @@ class MockAndroidDevice extends Mock implements AndroidDevice {
 
 class MockIOSDevice extends Mock implements IOSDevice {
   @override
-  TargetPlatform get platform => TargetPlatform.ios_arm;
+  TargetPlatform get platform => TargetPlatform.ios;
 
   @override
   bool isSupported() => true;
@@ -53,7 +53,7 @@ class MockIOSDevice extends Mock implements IOSDevice {
 
 class MockIOSSimulator extends Mock implements IOSSimulator {
   @override
-  TargetPlatform get platform => TargetPlatform.ios_x64;
+  TargetPlatform get platform => TargetPlatform.ios;
 
   @override
   bool isSupported() => true;