Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate perfetto to flutter/third_party #51272

Merged
merged 2 commits into from
Mar 12, 2024

Conversation

cbracken
Copy link
Member

@cbracken cbracken commented Mar 7, 2024

Migrate perfetto from the buildroot's third_party directory to the engine's.

Issue: flutter/flutter#144204
Part of: flutter/flutter#67373

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'm sure the licence script won't like this, but I promise to fix it when it inevitably complains.
  • 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.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@cbracken cbracken force-pushed the perfetto-to-flutter-third_party branch 2 times, most recently from 634cd22 to e8c37d1 Compare March 9, 2024 01:05
@cbracken cbracken force-pushed the perfetto-to-flutter-third_party branch from e8c37d1 to 5e2dc3e Compare March 11, 2024 17:59
@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 11, 2024
Copy link
Contributor

auto-submit bot commented Mar 11, 2024

auto label is removed for flutter/engine/51272, due to - The status or check suite Mac mac_clang_tidy 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 Mar 11, 2024
@cbracken
Copy link
Member Author

cbracken commented Mar 11, 2024

Looks like some failures during #include of a perfetto header, mostly like:

In file included from ../../flutter/third_party/perfetto/include/perfetto/base/export.h:20:
../../flutter/third_party/perfetto/include/perfetto/base/build_config.h:142:10: fatal error: 'perfetto_build_flags.h' file not found
  142 | #include "perfetto_build_flags.h"  // no-include-violation-check
      |          ^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

perfetto_build_flags.h is a generated file located at $root_gen_dir/$perfetto_root_path/build_config.

Looks like I need to patch the Dart SDK to perfetto config to update the include dir.

@cbracken
Copy link
Member Author

Followup patch is out at https://dart-review.googlesource.com/c/sdk/+/356960

Migrate perfetto from the buildroot's third_party directory to the
engine's.

Issue: flutter/flutter#144808
Part of: flutter/flutter#67373
@cbracken cbracken force-pushed the perfetto-to-flutter-third_party branch from 5e2dc3e to bb66085 Compare March 12, 2024 16:14
@cbracken cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 12, 2024
@auto-submit auto-submit bot merged commit c076d21 into flutter:main Mar 12, 2024
30 checks passed
@cbracken cbracken deleted the perfetto-to-flutter-third_party branch March 12, 2024 17:14
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 12, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 12, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Mar 12, 2024
…145018)

flutter/engine@af1fd17...9db394d

2024-03-12 bdero@google.com [Impeller] Fix shader depth assignment & glyph atlas transform. (flutter/engine#51343)
2024-03-12 jacksongardner@google.com Reland "Move emscripten out of the buildroot into the flutter repo" (flutter/engine#51353)
2024-03-12 skia-flutter-autoroll@skia.org Roll Skia from c123cce23f20 to 6e1f7333b2c7 (1 revision) (flutter/engine#51356)
2024-03-12 skia-flutter-autoroll@skia.org Roll Skia from 32f1cb50734a to c123cce23f20 (9 revisions) (flutter/engine#51351)
2024-03-12 chris@bracken.jp Migrate perfetto to flutter/third_party (flutter/engine#51272)

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 bdero@google.com,rmistry@google.com,zra@google.com 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 join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants