Skip to content

Build App.framework directly to build directory#69699

Merged
jmagman merged 3 commits intoflutter:masterfrom
jmagman:app-fw-build-loc
Nov 3, 2020
Merged

Build App.framework directly to build directory#69699
jmagman merged 3 commits intoflutter:masterfrom
jmagman:app-fw-build-loc

Conversation

@jmagman
Copy link
Member

@jmagman jmagman commented Nov 3, 2020 •
edited
Loading

#69612 with updated ios_content_validation_test.

Description

Since #51453 we no longer need to build the App.framework to a known directory like project/ios/Flutter/App.framework. Instead, build the frameworks directly to the build products directory. For example, flutter build ios -v --simulator will build to /build/ios/Debug-iphonesimulator/App.framework.

Additionally, this sets us up to no longer need to lipo the simulator and non-simulator frameworks together since they will build to different directories.

flutter/packages/flutter_tools/lib/src/build_system/targets/ios.dart

Lines 103 to 112 in cb67513

final String resultPath = environment.fileSystem.path.join(environment.buildDir.path, 'App.framework', 'App');
environment.fileSystem.directory(resultPath).parent.createSync(recursive: true);
final ProcessResult result = await environment.processManager.run(<String>[
'lipo',
...darwinArchs.map((DarwinArch iosArch) =>
environment.fileSystem.path.join(buildOutputPath, getNameForDarwinArch(iosArch), 'App.framework', 'App')),
'-create',
'-output',
resultPath,
]);

When Apple Silicon ships and ARM simulators are supported, this lipo will fail since the simulator and real device frameworks will both contain arm64.

Also stop copying the .DS_Store directories, while we're at it (already done with Flutter.framework). These files shouldn't be copied, and it adds spew during the installation phase:

[        ] [ 31%] Copying
/build/ios/iphoneos/Runner.app/Frameworks/App.framework/flutter_assets/assets/navbar/.DS_Store to
device

Related Issues

#60118

Tests

Updated ios_content_validation_test. Already many many integration tests that will blow up in the compiled dart code or flutter_assets are missing.

@jmagman jmagman added the t: xcode "xcodebuild" on iOS and general Xcode project management label Nov 3, 2020
@jmagman jmagman requested a review from jonahwilliams November 3, 2020 18:51
@jmagman jmagman self-assigned this Nov 3, 2020
@flutter-dashboard flutter-dashboard bot added c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Nov 3, 2020
@google-cla google-cla bot added the cla: yes label Nov 3, 2020
jmagman
jmagman commented Nov 3, 2020
View reviewed changes
dev/devicelab/bin/tasks/ios_content_validation_test.dart
Comment on lines +122 to +127
'BUILT_PRODUCTS_DIR': path.join(
flutterProject.rootPath,
'build',
'ios',
'Release-iphoneos',
),
Copy link
Member Author

@jmagman jmagman Nov 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been added to #69612.

This test fakes out some Xcode build settings to directly test xcode_backend. We can always rely on BUILT_PRODUCTS_DIR being present when run directly in Xcode.

jonahwilliams
jonahwilliams approved these changes Nov 3, 2020
View reviewed changes
Copy link
Contributor

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jmagman jmagman merged commit 91b8234 into flutter:master Nov 3, 2020
@jmagman jmagman deleted the app-fw-build-loc branch November 3, 2020 20:48
This was referenced Nov 4, 2020
Merged
Closed
Merged
Merged
Merged
@jmagman jmagman mentioned this pull request Dec 15, 2020
Merged
@jmagman jmagman added the platform-host-arm Building on an ARM-based platform label Aug 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jonahwilliams jonahwilliams jonahwilliams approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jmagman jmagman

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt. platform-host-arm Building on an ARM-based platform t: xcode "xcodebuild" on iOS and general Xcode project management tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jmagman @jonahwilliams