diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart index f61edf43bc..996540989a 100644 --- a/dev/devicelab/bin/tasks/module_test_ios.dart +++ b/dev/devicelab/bin/tasks/module_test_ios.dart @@ -462,7 +462,7 @@ end if ((await fileType(builtFlutterBinary)).contains('armv7')) { throw TaskResult.failure('Unexpected armv7 architecture slice in $builtFlutterBinary'); } - await containsBitcode(builtFlutterBinary); + await checkContainsBitcode(builtFlutterBinary); final String builtAppBinary = path.join( archivedAppPath, @@ -474,7 +474,7 @@ end if ((await fileType(builtAppBinary)).contains('armv7')) { throw TaskResult.failure('Unexpected armv7 architecture slice in $builtAppBinary'); } - await containsBitcode(builtAppBinary); + await checkContainsBitcode(builtAppBinary); // The host app example builds plugins statically, url_launcher_ios.framework // should not exist. diff --git a/dev/devicelab/lib/framework/ios.dart b/dev/devicelab/lib/framework/ios.dart index 2a384edbe2..275781247a 100644 --- a/dev/devicelab/lib/framework/ios.dart +++ b/dev/devicelab/lib/framework/ios.dart @@ -8,6 +8,7 @@ import 'dart:io'; import 'package:path/path.dart' as path; import 'host_agent.dart'; +import 'task_result.dart'; import 'utils.dart'; typedef SimulatorFunction = Future Function(String deviceId); @@ -84,6 +85,12 @@ Future containsBitcode(String pathToBinary) async { return !emptyBitcodeMarkerFound; } +Future checkContainsBitcode(String pathToBinary) async { + if (!await containsBitcode(pathToBinary)) { + throw TaskResult.failure('Expected bitcode in $pathToBinary'); + } +} + /// Creates and boots a new simulator, passes the new simulator's identifier to /// `testFunction`. ///