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

Fix header-guard naming convention in shell/. #49006

Merged
merged 6 commits into from
Dec 14, 2023

Conversation

matanlurey
Copy link
Contributor

Part of landing #48903.

Some of these actually seem like potential owchy spots, i.e. #ifndef FLUTTER_FLUTTER_H_.

@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 "@text-exemption-reviewers" 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.

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 14, 2023
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 14, 2023
Copy link
Contributor

auto-submit bot commented Dec 14, 2023

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

  • The status or check suite Linux linux_arm_host_engine has failed. Please fix the issues identified (or deflake) before re-applying this label.
  • The status or check suite Linux linux_fuchsia has failed. Please fix the issues identified (or deflake) before re-applying this label.

Copy link
Member

@loic-sharma loic-sharma left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this, great work!

Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

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

Err, whoops! We missed a couple, it looks like! Thanks for fixing this!

#ifndef FLUTTER_FLUTTERBINARYMESSENGER_H_
#define FLUTTER_FLUTTERBINARYMESSENGER_H_
#ifndef FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERBINARYMESSENGER_H_
#define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_HEADERS_FLUTTERBINARYMESSENGER_H_
Copy link
Member

Choose a reason for hiding this comment

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

The public headers were intentional since users import them as Flutter/FlutterBinaryMessenger.h but in the end the symbol itself doesn't matter so long as it's unique (and ideally consistent), which this is, so lgtm.

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 14, 2023
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 14, 2023
Copy link
Contributor

auto-submit bot commented Dec 14, 2023

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

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 14, 2023
@auto-submit auto-submit bot merged commit d883683 into flutter:main Dec 14, 2023
26 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 15, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Dec 15, 2023
…140195)

flutter/engine@0e7248d...4cb3ba7

2023-12-15 [email protected] Roll Skia from 79f23e8d8b5d to cd2f06086c96 (1 revision) (flutter/engine#49069)
2023-12-15 [email protected] Roll Dart SDK from 0471164827b9 to f1e37ed8917e (1 revision) (flutter/engine#49065)
2023-12-15 [email protected] [Impeller] impellerc: delete unused code (flutter/engine#49061)
2023-12-15 [email protected] [Impeller] split out gradient tests from aiks_unittests (flutter/engine#49050)
2023-12-15 [email protected] Revert "[Impeller] Turned on new blur." (flutter/engine#49062)
2023-12-14 [email protected] Fix header-guard naming convention in `shell/`. (flutter/engine#49006)
2023-12-14 [email protected] Manual roll of Dart SDK from a677378ae254 to 0471164827b9 (flutter/engine#49054)
2023-12-14 [email protected] Rename `font-subset` to `font_subset`. (flutter/engine#49051)
2023-12-14 [email protected] Roll Skia from 92935b91193a to 79f23e8d8b5d (1 revision) (flutter/engine#49056)
2023-12-14 [email protected] Suppress warning for the new Activity library. (flutter/engine#49046)
2023-12-14 [email protected] [Impeller] distinguish between no clear color and transparent black clear color. (flutter/engine#49038)
2023-12-14 [email protected] Unpin mac_toolchain version (flutter/engine#48994)
2023-12-14 [email protected] [Impeller] Turned on new blur. (flutter/engine#48472)
2023-12-14 [email protected] Remove unused metadata in DEPS from vuln scanning (flutter/engine#48995)

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
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Apr 12, 2024
1. Change chromium default branch from master (404) to main.
2. When I migrated the template to ARC is triggered a `-Wobjc-redundant-literal-use` error, so fix that.  Engine PR is flutter/engine#51981
3. Update to `FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_KEY_CODES_G_H_` to match flutter/engine#49006

This only updates the template and the script--I ran the script to validate it worked and built in the engine, but did not check in the actual generated key code changes (filed #146480 for that).
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
1. Change chromium default branch from master (404) to main.
2. When I migrated the template to ARC is triggered a `-Wobjc-redundant-literal-use` error, so fix that.  Engine PR is flutter/engine#51981
3. Update to `FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_KEY_CODES_G_H_` to match flutter/engine#49006

This only updates the template and the script--I ran the script to validate it worked and built in the engine, but did not check in the actual generated key code changes (filed flutter#146480 for that).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants