diff --git a/engine/src/flutter/sky/tools/gn b/engine/src/flutter/sky/tools/gn
index 4b78828937..1096730e41 100755
--- a/engine/src/flutter/sky/tools/gn
+++ b/engine/src/flutter/sky/tools/gn
@@ -67,7 +67,6 @@ def to_gn_args(args):
           aot = False
         else:
           # The iOS simulator snapshot is host targetted
-          gn_args['dart_target_arch'] = ios_target_cpu
           aot = True
     elif args.target_os == 'fnl':
       gn_args['target_os'] = 'fnl'
@@ -91,6 +90,8 @@ def to_gn_args(args):
         gn_args['target_cpu'] = 'x64'
 
     if aot:
+        gn_args['flutter_aot'] = True
+        gn_args['dart_target_arch'] = gn_args['target_cpu']
         if args.debug:
             gn_args['dart_runtime_mode'] = 'profile'
         else:
@@ -98,6 +99,8 @@ def to_gn_args(args):
     else:
         gn_args['dart_runtime_mode'] = 'develop'
 
+    gn_args['flutter_product_mode'] = (gn_args['dart_runtime_mode'] == 'release')
+
     if args.target_sysroot:
       gn_args['target_sysroot'] = args.target_sysroot