From 58092195091298b5112f4f935a743de2f77d1458 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Thu, 1 Aug 2019 11:16:21 -0700 Subject: [PATCH] Remove multi-arch check in iOS builds (#37407) * Remove multi-arch check in iOS builds * Manual roll of https://github.com/flutter/engine/pull/10010 --- bin/internal/engine.version | 2 +- packages/flutter_tools/lib/src/base/build.dart | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 7a7767e92cb..912f264fa91 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -b41c172bcd861a09ccbe7a4b1addeb125d6f9541 +9fca3c74491a6f92322ca55cab53b9361c583135 diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart index f9906a027bd..6afe479c002 100644 --- a/packages/flutter_tools/lib/src/base/build.dart +++ b/packages/flutter_tools/lib/src/base/build.dart @@ -56,15 +56,6 @@ class GenSnapshot { final String snapshotterPath = getSnapshotterPath(snapshotType); - // iOS gen_snapshot is a multi-arch binary. Running as an i386 binary will - // generate armv7 code. Running as an x86_64 binary will generate arm64 - // code. /usr/bin/arch can be used to run binaries with the specified - // architecture. - if (snapshotType.platform == TargetPlatform.ios) { - final String hostArch = iosArch == IOSArch.armv7 ? '-i386' : '-x86_64'; - return runCommandAndStreamOutput(['/usr/bin/arch', hostArch, snapshotterPath, ...args]); - } - StringConverter outputFilter; if (additionalArgs.contains('--strip')) { // Filter out gen_snapshot's warning message about stripping debug symbols