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 imports for FlutterApplication #40100

Merged
merged 2 commits into from
Mar 7, 2023
Merged

Conversation

gspencergoog
Copy link
Contributor

@gspencergoog gspencergoog commented Mar 6, 2023

Description

In #39836, There were some includes that VSCode added that didn't have the correct path, although they do compile in the engine repo, they cause problems when rolled to Google's internal repo because they don't have the correct prefix.

For future archaeologists, the setting to stop clangd from inserting headers that it doesn't really know how to insert properly is:

    "clangd.arguments": [
        "--header-insertion=never"
    ],

@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 Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on 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.

Copy link
Contributor

@XilaiZhang XilaiZhang left a comment

Choose a reason for hiding this comment

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

images (1)

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.

LGTM stamp from a Japanese personal seal

#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h"
#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h"
#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"

Copy link
Member

Choose a reason for hiding this comment

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

Delete the spare line here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh, OK. I thought I should separate the C++ from the Objective C headers.

@CaseyHillers
Copy link
Contributor

CaseyHillers commented Mar 7, 2023

test-exempt: Change to import paths to fix Google Testing

@gspencergoog gspencergoog added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 7, 2023
@auto-submit auto-submit bot merged commit 3a565f0 into flutter:main Mar 7, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 7, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 7, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 7, 2023
XilaiZhang pushed a commit to XilaiZhang/engine that referenced this pull request Mar 7, 2023
Fix imports for FlutterApplication
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 7, 2023
XilaiZhang added a commit that referenced this pull request Mar 7, 2023
Fix imports for FlutterApplication

Co-authored-by: Greg Spencer <gspencergoog@users.noreply.github.com>
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 7, 2023
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 needs tests platform-macos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants