Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

macOS: Make framework creation consistent with iOS #54685

Merged
merged 5 commits into from
Aug 21, 2024
Merged

macOS: Make framework creation consistent with iOS #54685

merged 5 commits into from
Aug 21, 2024

Conversation

cbracken
Copy link
Member

@cbracken cbracken commented Aug 21, 2024 •
edited
Loading

Separates dSYM creation from archiving, consistent with iOS tooling. This
introduces no semantic changes, but simply adjusts create_fat_macos_framework
and process_framework for consistency with the equivalent iOS tooling in
create_ios_framework.py.

Related issue: flutter/flutter#153879

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@cbracken cbracken added the test: all See https://github.com/flutter/engine/blob/main/docs/ci/Engine-pre-submits-and-post-submits.md label Aug 21, 2024
@cbracken cbracken requested review from jmagman and zanderso August 21, 2024 17:57
@cbracken
Copy link
Member Author

Will kick off a test framework roll once this builds. This is the final refactor (promise!) before the dSYM embedding lands.

jmagman
jmagman reviewed Aug 21, 2024
View reviewed changes
cbracken
cbracken commented Aug 21, 2024
View reviewed changes
cbracken
cbracken commented Aug 21, 2024
View reviewed changes
sky/tools/sky_utils.py
# Compute dsym output path, if enabled.
framework_dsym = None
if args.dsym:
framework_dsym = os.path.join(dst, get_framework_name(fat_framework) + '.dSYM')
Copy link
Member Author

Choose a reason for hiding this comment

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

Alright -- it's over here.

cbracken added a commit to cbracken/flutter that referenced this pull request Aug 21, 2024
@cbracken
DO NOT SUBMIT: TEST ENGINE ROLL
ebc85fe 
Test roll of flutter/engine#54685 "macOS: Make framework creation consistent with iOS"
@cbracken cbracken mentioned this pull request Aug 21, 2024
Closed
9 tasks
@cbracken
Copy link
Member Author

Test patch out at flutter/flutter#153874

cbracken added a commit to cbracken/flutter that referenced this pull request Aug 21, 2024
@cbracken
DO NOT SUBMIT: TEST ENGINE ROLL
83bfe47 
Test roll of flutter/engine#54685 "macOS: Make framework creation consistent with iOS"
cbracken added a commit to cbracken/flutter that referenced this pull request Aug 21, 2024
@cbracken
DO NOT SUBMIT: TEST ENGINE ROLL
d823bcb 
Test roll of flutter/engine#54685 "macOS: Make framework creation consistent with iOS"
@cbracken
Copy link
Member Author

All macOS and iOS tests have passed in the framework test roll.

@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 21, 2024
@auto-submit Auto-submit
Copy link
Contributor

auto-submit bot commented Aug 21, 2024

auto label is removed for flutter/engine/54685, due to - The status or check suite Linux local_engine_builds has failed. Please fix the issues identified (or deflake) before re-applying this label.

@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 21, 2024
@cbracken
Copy link
Member Author

First run died on a cancelled linux_local_engine_builds shard. Second run died on a flake timing out while trying to find Xcode. Third time lucky?

@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 21, 2024
@auto-submit auto-submit bot merged commit 079c5ec into flutter:main Aug 21, 2024
38 checks passed
@cbracken cbracken deleted the consistency-with-ios branch August 21, 2024 23:37
cbracken added a commit to cbracken/flutter that referenced this pull request Aug 22, 2024
@cbracken
DO NOT SUBMIT: TEST ENGINE ROLL
b6619c0 
Test roll of flutter/engine#54685 "macOS: Make framework creation consistent with iOS"
@cbracken cbracken mentioned this pull request Aug 22, 2024
Closed
9 tasks
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 22, 2024
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 22, 2024
@engine-flutter-autoroll
079c5ecca macOS: Make framework creation consistent with iOS (flutter…
5beaa0c 
…/engine#54685)
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Aug 22, 2024
@engine-flutter-autoroll
Roll Flutter Engine from b94e0097035d to 85d4be037314 (26 revisions) (#…
879362c 
…153902)

flutter/engine@b94e009...85d4be0

2024-08-22 [email protected] Export GPU symbols for embedder (flutter/engine#54662)
2024-08-22 [email protected] [Impeller] Remove a log message in the Vulkan back end that is visible during engine startup (flutter/engine#54699)
2024-08-22 [email protected] Roll Skia from 3cd00377cefc to 34aa8ce13af6 (3 revisions) (flutter/engine#54698)
2024-08-21 [email protected] macOS: Make framework creation consistent with iOS (flutter/engine#54685)
2024-08-21 [email protected] Roll Skia from 69f4bd859025 to 3cd00377cefc (8 revisions) (flutter/engine#54693)
2024-08-21 [email protected] Roll Dart SDK from 060e40916514 to 025bf8d376d3 (1 revision) (flutter/engine#54692)
2024-08-21 [email protected] Split tests out of Linux Android artifact creation builds (flutter/engine#54683)
2024-08-21 [email protected] Roll Skia from 249d3f07c4d5 to 69f4bd859025 (5 revisions) (flutter/engine#54691)
2024-08-21 [email protected] [iOS] Tweak note about OpenGL support on mac in a user facing log. (flutter/engine#54690)
2024-08-21 [email protected] [Impeller] use blit pass to resize decoded images. (flutter/engine#54606)
2024-08-21 [email protected] Remove spammy warning message on `FlutterView` (flutter/engine#54686)
2024-08-21 [email protected] [Impeller] Perform integrity checks for Vulkan pipeline caches. (flutter/engine#54654)
2024-08-21 [email protected] docs: use test: all rather than editing .ci.yaml (flutter/engine#54667)
2024-08-21 [email protected] Reland "[DisplayList] Allow random access to ops through indexing" (flutter/engine#54676)
2024-08-21 [email protected] Roll Skia from 51ac9d93850c to 249d3f07c4d5 (2 revisions) (flutter/engine#54684)
2024-08-21 [email protected] iOS,macOS: Don't archive extra framework metadata (flutter/engine#54674)
2024-08-21 [email protected] Roll Dart SDK from 48f9b96d71e7 to 060e40916514 (1 revision) (flutter/engine#54682)
2024-08-21 [email protected] [web] annotate obscured text fields as passwords (flutter/engine#54664)
2024-08-21 [email protected] Roll Skia from c31e2ca59bd9 to 51ac9d93850c (2 revisions) (flutter/engine#54681)
2024-08-21 [email protected] [engine] reland weaken affinity of raster/ui to non-e core instead of only fast core (flutter/engine#54616)
2024-08-21 [email protected] Roll Skia from c00866df101a to c31e2ca59bd9 (2 revisions) (flutter/engine#54680)
2024-08-21 [email protected] Roll Skia from 39e5118034f4 to c00866df101a (1 revision) (flutter/engine#54678)
2024-08-21 [email protected] Roll Skia from 221ada80b174 to 39e5118034f4 (1 revision) (flutter/engine#54677)
2024-08-21 [email protected] Roll Skia from d576296091e0 to 221ada80b174 (2 revisions) (flutter/engine#54675)
2024-08-21 [email protected] Roll Dart SDK from 49f655b526c7 to 48f9b96d71e7 (1 revision) (flutter/engine#54672)
2024-08-21 [email protected] Roll Fuchsia Linux SDK from 3a16kOsyFmJh3lo7e... to XGzE3idakwfQZ68pb... (flutter/engine#54671)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from 3a16kOsyFmJh to XGzE3idakwfQ

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Buchimi pushed a commit to Buchimi/flutter that referenced this pull request Sep 2, 2024
@engine-flutter-autoroll @Buchimi
Roll Flutter Engine from b94e0097035d to 85d4be037314 (26 revisions) (f…
a668711 
…lutter#153902)

flutter/engine@b94e009...85d4be0

2024-08-22 [email protected] Export GPU symbols for embedder (flutter/engine#54662)
2024-08-22 [email protected] [Impeller] Remove a log message in the Vulkan back end that is visible during engine startup (flutter/engine#54699)
2024-08-22 [email protected] Roll Skia from 3cd00377cefc to 34aa8ce13af6 (3 revisions) (flutter/engine#54698)
2024-08-21 [email protected] macOS: Make framework creation consistent with iOS (flutter/engine#54685)
2024-08-21 [email protected] Roll Skia from 69f4bd859025 to 3cd00377cefc (8 revisions) (flutter/engine#54693)
2024-08-21 [email protected] Roll Dart SDK from 060e40916514 to 025bf8d376d3 (1 revision) (flutter/engine#54692)
2024-08-21 [email protected] Split tests out of Linux Android artifact creation builds (flutter/engine#54683)
2024-08-21 [email protected] Roll Skia from 249d3f07c4d5 to 69f4bd859025 (5 revisions) (flutter/engine#54691)
2024-08-21 [email protected] [iOS] Tweak note about OpenGL support on mac in a user facing log. (flutter/engine#54690)
2024-08-21 [email protected] [Impeller] use blit pass to resize decoded images. (flutter/engine#54606)
2024-08-21 [email protected] Remove spammy warning message on `FlutterView` (flutter/engine#54686)
2024-08-21 [email protected] [Impeller] Perform integrity checks for Vulkan pipeline caches. (flutter/engine#54654)
2024-08-21 [email protected] docs: use test: all rather than editing .ci.yaml (flutter/engine#54667)
2024-08-21 [email protected] Reland "[DisplayList] Allow random access to ops through indexing" (flutter/engine#54676)
2024-08-21 [email protected] Roll Skia from 51ac9d93850c to 249d3f07c4d5 (2 revisions) (flutter/engine#54684)
2024-08-21 [email protected] iOS,macOS: Don't archive extra framework metadata (flutter/engine#54674)
2024-08-21 [email protected] Roll Dart SDK from 48f9b96d71e7 to 060e40916514 (1 revision) (flutter/engine#54682)
2024-08-21 [email protected] [web] annotate obscured text fields as passwords (flutter/engine#54664)
2024-08-21 [email protected] Roll Skia from c31e2ca59bd9 to 51ac9d93850c (2 revisions) (flutter/engine#54681)
2024-08-21 [email protected] [engine] reland weaken affinity of raster/ui to non-e core instead of only fast core (flutter/engine#54616)
2024-08-21 [email protected] Roll Skia from c00866df101a to c31e2ca59bd9 (2 revisions) (flutter/engine#54680)
2024-08-21 [email protected] Roll Skia from 39e5118034f4 to c00866df101a (1 revision) (flutter/engine#54678)
2024-08-21 [email protected] Roll Skia from 221ada80b174 to 39e5118034f4 (1 revision) (flutter/engine#54677)
2024-08-21 [email protected] Roll Skia from d576296091e0 to 221ada80b174 (2 revisions) (flutter/engine#54675)
2024-08-21 [email protected] Roll Dart SDK from 49f655b526c7 to 48f9b96d71e7 (1 revision) (flutter/engine#54672)
2024-08-21 [email protected] Roll Fuchsia Linux SDK from 3a16kOsyFmJh3lo7e... to XGzE3idakwfQZ68pb... (flutter/engine#54671)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from 3a16kOsyFmJh to XGzE3idakwfQ

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
2 more reviewers

@jmagman jmagman jmagman left review comments

@zanderso zanderso zanderso approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App test: all See https://github.com/flutter/engine/blob/main/docs/ci/Engine-pre-submits-and-post-submits.md
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cbracken @jmagman @zanderso