development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-02 22:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust lipo thinning input/output for macOS (#97111)

Browse source
This commit is contained in:
Zachary Anderson 2022-01-24 10:21:22 -08:00 committed by GitHub
parent 0978b96ecd
commit 761b109bc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/flutter_tools/lib/src/build_system/targets/macos.dart
View file

@ -36,7 +36,7 @@ abstract class UnpackMacOS extends Target {
@override
List<Source> get outputs => const <Source>[
Source.pattern('{OUTPUT_DIR}/FlutterMacOS.framework/FlutterMacOS'),
Source.pattern('{OUTPUT_DIR}/FlutterMacOS.framework/Versions/A/FlutterMacOS'),
];
@override
@ -67,7 +67,11 @@ abstract class UnpackMacOS extends Target {
);
}
final File frameworkBinary = environment.outputDir.childDirectory('FlutterMacOS.framework').childFile('FlutterMacOS');
final File frameworkBinary = environment.outputDir
.childDirectory('FlutterMacOS.framework')
.childDirectory('Versions')
.childDirectory('A')
.childFile('FlutterMacOS');
final String frameworkBinaryPath = frameworkBinary.path;
if (!frameworkBinary.existsSync()) {
throw Exception('Binary $frameworkBinaryPath does not exist, cannot thin');

10
packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart
View file

@ -51,8 +51,10 @@ void main() {
);
binary = environment.outputDir
.childDirectory('FlutterMacOS.framework')
.childFile('FlutterMacOS');
.childDirectory('FlutterMacOS.framework')
.childDirectory('Versions')
.childDirectory('A')
.childFile('FlutterMacOS');
copyFrameworkCommand = FakeCommand(
command: <String>[
@ -109,7 +111,7 @@ void main() {
throwsA(isException.having(
(Exception exception) => exception.toString(),
'description',
contains('FlutterMacOS.framework/FlutterMacOS does not exist, cannot thin'),
contains('FlutterMacOS.framework/Versions/A/FlutterMacOS does not exist, cannot thin'),
)),
);
}, overrides: <Type, Generator>{
@ -155,7 +157,7 @@ void main() {
await const DebugUnpackMacOS().build(environment);
expect(logger.traceText, contains('Skipping lipo for non-fat file /FlutterMacOS.framework/FlutterMacOS'));
expect(logger.traceText, contains('Skipping lipo for non-fat file /FlutterMacOS.framework/Versions/A/FlutterMacOS'));
});
testUsingContext('thins fat framework', () async {