From 28e644e87a14ed159d370418429152aaa0ec1934 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Thu, 10 May 2018 12:45:15 -0700 Subject: [PATCH] Explicitly specify softfp ABI for armv7 builds (#17453) This reverts #17147, which was safe under the assumption that getArtifactPath() returns a platform-specific gen_snapshot instance (which have the correct default set for this flag) -- it turns out that though we pass the platform to getArtifactPath(), we always return the host gen_snapshot for Android. A followup patch will update getArtifactPath and revert this patch. --- packages/flutter_tools/lib/src/base/build.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart index 45c8c8d87f..1ee8166e3b 100644 --- a/packages/flutter_tools/lib/src/base/build.dart +++ b/packages/flutter_tools/lib/src/base/build.dart @@ -222,6 +222,11 @@ class AOTSnapshotter { } if (platform == TargetPlatform.android_arm || iosArch == IOSArch.armv7) { + // Use softfp for Android armv7 devices. + // Note that this is the default for armv7 iOS builds, but harmless to set. + // TODO(cbracken) use TargetPlatform-specific gen_snapshot for Android so that this is defaulted. + genSnapshotArgs.add('--no-sim-use-hardfp'); + // Not supported by the Pixel in 32-bit mode. genSnapshotArgs.add('--no-use-integer-division'); }