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

Remove dependency on memfs #42773

Merged
merged 2 commits into from
Jun 12, 2023
Merged

Remove dependency on memfs #42773

merged 2 commits into from
Jun 12, 2023

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Jun 12, 2023

See individual commits.

@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.

@eyebrowsoffire
Copy link
Contributor

Looks like some of the sources in flutter actually link on memfs:

[737/9537] CXX obj/flutter/shell/platform/fuchsia/runtime/dart/utils/utils.tempfs.o
FAILED: obj/flutter/shell/platform/fuchsia/runtime/dart/utils/utils.tempfs.o 
/b/s/w/ir/cache/goma/client/gomacc  ../../buildtools/linux-x64/clang/bin/clang++ -MD -MF obj/flutter/shell/platform/fuchsia/runtime/dart/utils/utils.tempfs.o.d --target=x86_64-fuchsia --sysroot ../../fuchsia/sdk/linux/arch/x64/sysroot  -DUSE_OPENSSL=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../.. -Igen -I../../flutter/shell/platform/fuchsia -Igen/build/fuchsia/fidl -I../../fuchsia/sdk/linux/pkg/fidl_cpp/include -I../../fuchsia/sdk/linux/pkg/async/include -I../../fuchsia/sdk/linux/pkg/fit/include -I../../fuchsia/sdk/linux/pkg/stdcompat/include -I../../fuchsia/sdk/linux/pkg/fit-promise/include -I../../fuchsia/sdk/linux/pkg/async-default/include -I../../fuchsia/sdk/linux/pkg/fidl/include -I../../fuchsia/sdk/linux/pkg/fidl_base/include -I../../fuchsia/sdk/linux/pkg/utf-utils/include -I../../fuchsia/sdk/linux/pkg/zx/include -I../../fuchsia/sdk/linux/pkg/fidl_cpp_sync/include -I../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include -I../../fuchsia/sdk/linux/pkg/async-loop/include -I../../fuchsia/sdk/linux/pkg/async-loop-cpp/include -I../../fuchsia/sdk/linux/pkg/async-loop-default/include -I../../fuchsia/sdk/linux/pkg/fdio/include -I../../fuchsia/sdk/linux/pkg/sys_cpp/include -I../../fuchsia/sdk/linux/pkg/sys_service_cpp/include -I../../fuchsia/sdk/linux/pkg/async-cpp/include -I../../fuchsia/sdk/linux/pkg/vfs_cpp/include -I../../fuchsia/sdk/linux/pkg/sys_inspect_cpp/include -I../../fuchsia/sdk/linux/pkg/inspect/include -I../../fuchsia/sdk/linux/pkg/inspect_service_cpp/include -I../../fuchsia/sdk/linux/pkg/syslog/include -I../../fuchsia/sdk/linux/pkg/trace-engine/include -I../../fuchsia/sdk/linux/pkg/trace/include -I../../flutter/third_party -I../../flutter -I../../third_party/dart/runtime -I../../third_party/dart/runtime/include -fno-strict-aliasing -m64 -march=x86-64 -fcolor-diagnostics -ffuchsia-api-level=12 -Wall -Wextra -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-implicit-int-float-conversion -Wno-c99-designator -Wno-deprecated-copy -Wno-psabi -Wno-unqualified-std-cast-call -fvisibility=hidden -Wstring-conversion -Wnewline-eof -Oz -fno-ident -fdata-sections -ffunction-sections -g2 -fvisibility-inlines-hidden -std=c++17 -fno-rtti -fno-exceptions -c ../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc -o obj/flutter/shell/platform/fuchsia/runtime/dart/utils/utils.tempfs.o
../../flutter/shell/platform/fuchsia/runtime/dart/utils/tempfs.cc:16:10: fatal error: 'lib/vfs/cpp/pseudor_dir.h' file not found
   16 | #include <lib/vfs/cpp/pseudor_dir.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

@eyebrowsoffire
Copy link
Contributor

Oh, that's the replacement dependency. Doesn't look like the build is able to source it though.

@tamird
Copy link
Contributor Author

tamird commented Jun 12, 2023

Just a typo.

memfs was removed from the fuchsia SDK in https://fxrev.dev/c/867584.
Replace its usage with vfs::PseudoDir.

Fixes flutter/flutter#128703.
@tamird
Copy link
Contributor Author

tamird commented Jun 12, 2023

This is green on fuchsia - PTAL.

Copy link
Member

@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.

RSLGTM

@jonahwilliams jonahwilliams added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 12, 2023
@auto-submit auto-submit bot merged commit 77d534c into main Jun 12, 2023
31 checks passed
@auto-submit auto-submit bot deleted the memfs branch June 12, 2023 17:14
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 12, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 12, 2023
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jun 12, 2023
…128721)

flutter/engine@33e0693...de68fba

2023-06-12 smartercallum@gmail.com Fix crash with CJK keyboard with emoji at end of text field (flutter/engine#42540)
2023-06-12 skia-flutter-autoroll@skia.org Roll Skia from 658b1d366758 to 6bdb0ef30cb6 (2 revisions) (flutter/engine#42778)
2023-06-12 jonahwilliams@google.com [Impeller] Correct attachment description for offscreen MSAA resolve. (flutter/engine#42753)
2023-06-12 tamird@google.com Remove dependency on memfs (flutter/engine#42773)
2023-06-12 skia-flutter-autoroll@skia.org Roll Skia from 0f974a0f8c10 to 658b1d366758 (1 revision) (flutter/engine#42776)
2023-06-12 skia-flutter-autoroll@skia.org Roll ANGLE from 3abbc4f99970 to 43ef50f389e9 (1 revision) (flutter/engine#42775)
2023-06-12 kjlubick@users.noreply.github.com Remove unnecessary #include of SkPromiseImageTexture (flutter/engine#42770)
2023-06-12 skia-flutter-autoroll@skia.org Roll Skia from 951123096e55 to 0f974a0f8c10 (5 revisions) (flutter/engine#42771)
2023-06-12 jonahwilliams@google.com [Impeller] opt all vertex shader position/uvs into highp (flutter/engine#42746)
2023-06-12 30870216+gaaclarke@users.noreply.github.com [Impeller] added debug info to frame debuggers like AGI (flutter/engine#42717)

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 jacksongardner@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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

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 needs tests platform-fuchsia
Projects
None yet
3 participants