From 0d17f16c4b40cc3d39d2228cadfe0c99af2dd0f2 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@gmail.com>
Date: Thu, 26 May 2016 12:37:28 -0700
Subject: [PATCH] Pass the local-engine flag to both `build aot` and `build
 flx` to avoid using mismatched gen/sky_snapshot pairs. (#2715)

---
 .../sdk_xcode_harness/Tools/common/BuildFlutterApp    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sky/build/sdk_xcode_harness/Tools/common/BuildFlutterApp b/sky/build/sdk_xcode_harness/Tools/common/BuildFlutterApp
index 11001ba1d..8d7a113a0 100644
--- a/sky/build/sdk_xcode_harness/Tools/common/BuildFlutterApp
+++ b/sky/build/sdk_xcode_harness/Tools/common/BuildFlutterApp
@@ -41,17 +41,17 @@ BuildApp() {
 
   RunCommand pushd ${project_path}
 
+  local local_engine_flag=""
+  if [[ -n "$LOCAL_ENGINE" ]]; then
+    local_engine_flag="--local-engine=$LOCAL_ENGINE"
+  fi
+
   if [[ $CURRENT_ARCH != "x86_64" ]]; then
     local interpreter_flag="--interpreter"
     if [[ "$DART_EXPERIMENTAL_INTERPRETER" != "1" ]]; then
       interpreter_flag=""
     fi
 
-    local local_engine_flag=""
-    if [[ -n "$LOCAL_ENGINE" ]]; then
-      local_engine_flag="--local-engine=$LOCAL_ENGINE"
-    fi
-
     RunCommand ${FLUTTER_ROOT}/bin/flutter --suppress-analytics build aot \
       --target-platform=ios                                               \
       --release                                                           \
@@ -75,6 +75,7 @@ BuildApp() {
   RunCommand ${FLUTTER_ROOT}/bin/flutter --suppress-analytics build flx \
     --output-file=${derived_dir}/app.flx                                \
     ${precompilation_flag}                                              \
+    ${local_engine_flag}                                                \
 
   if [[ $? -ne 0 ]]; then
     EchoError "Failed to package $1."
-- 
GitLab