From 74e31679fbcdcb7465a5796107cb8a6bdc1bc5d2 Mon Sep 17 00:00:00 2001
From: Todd Volkert <tvolkert@users.noreply.github.com>
Date: Thu, 10 Nov 2016 10:30:17 -0800
Subject: [PATCH] Respect the --no-codesign flag even for simulators (#6799)

---
 packages/flutter_tools/lib/src/ios/mac.dart | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart
index f217e123e8e..da726d52304 100644
--- a/packages/flutter_tools/lib/src/ios/mac.dart
+++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -141,19 +141,20 @@ Future<XcodeBuildResult> buildXcodeProject({
 
   if (buildForDevice) {
     commands.addAll(<String>['-sdk', 'iphoneos', '-arch', 'arm64']);
-    if (!codesign) {
-      commands.addAll(
-        <String>[
-          'CODE_SIGNING_ALLOWED=NO',
-          'CODE_SIGNING_REQUIRED=NO',
-          'CODE_SIGNING_IDENTITY=""'
-        ]
-      );
-    }
   } else {
     commands.addAll(<String>['-sdk', 'iphonesimulator', '-arch', 'x86_64']);
   }
 
+  if (!codesign) {
+    commands.addAll(
+      <String>[
+        'CODE_SIGNING_ALLOWED=NO',
+        'CODE_SIGNING_REQUIRED=NO',
+        'CODE_SIGNING_IDENTITY=""'
+      ]
+    );
+  }
+
   RunResult result = await runAsync(
     commands,
     workingDirectory: app.appDirectory,