rename the platform constants
diff --git a/packages/flutter_tools/lib/src/build_configuration.dart b/packages/flutter_tools/lib/src/build_configuration.dart
index 0dc165f..25c73a5 100644
--- a/packages/flutter_tools/lib/src/build_configuration.dart
+++ b/packages/flutter_tools/lib/src/build_configuration.dart
@@ -20,11 +20,11 @@
 }
 
 enum TargetPlatform {
-  android,
-  iOS,
-  iOSSimulator,
-  mac,
-  linux,
+  android_arm,
+  ios_arm,
+  ios_x64,
+  darwin_x64,
+  linux_x64
 }
 
 HostPlatform getCurrentHostPlatform() {
@@ -38,18 +38,17 @@
 
 TargetPlatform getCurrentHostPlatformAsTarget() {
   if (Platform.isMacOS)
-    return TargetPlatform.mac;
+    return TargetPlatform.darwin_x64;
   if (Platform.isLinux)
-    return TargetPlatform.linux;
+    return TargetPlatform.linux_x64;
   printError('Unsupported host platform, defaulting to Linux');
-  return TargetPlatform.linux;
+  return TargetPlatform.linux_x64;
 }
 
 class BuildConfiguration {
   BuildConfiguration.prebuilt({
     this.hostPlatform,
     this.targetPlatform,
-    this.deviceId,
     this.testable: false
   }) : type = BuildType.prebuilt, buildDir = null;
 
@@ -59,7 +58,6 @@
     this.targetPlatform,
     String enginePath,
     String buildPath,
-    this.deviceId,
     this.testable: false
   }) : buildDir = path.normalize(path.join(enginePath, buildPath)) {
     assert(type == BuildType.debug || type == BuildType.release);
@@ -69,6 +67,5 @@
   final HostPlatform hostPlatform;
   final TargetPlatform targetPlatform;
   final String buildDir;
-  final String deviceId;
   final bool testable;
 }