Add WASM target in gn #31670

harryterkelsen · 2022-02-24T22:38:05Z

Rolls to latest version of ICU which supports building with WASM.
Adds emsdk to DEPS to get the emscripten toolchain working.

Addresses flutter/flutter#52588

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 Hixie said 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.

Rolls to latest version of ICU which supports building with WASM. Adds emsdk to DEPS to get the emscripten toolchain working.

tools/activate_emsdk.py

tools/gn

dnfield

Mostly nits/discussion

BUILD.gn

DEPS

tools/activate_emsdk.py

dnfield · 2022-03-04T18:42:04Z

tools/gn

+    if args.target_os != 'wasm':
+      gn_args['flutter_use_fontconfig'] = args.enable_fontconfig
+      gn_args['flutter_enable_skshaper'] = args.enable_skshaper


Why? Don't we want to use SkShaper if wasm?

flutter_enable_skshaper is unused if you don't build Flutter, so setting it will cause gn to fail

dnfield · 2022-03-04T18:42:38Z

tools/gn

    if args.target_os == 'winuwp':
      gn_args['skia_enable_winuwp'] = True
    gn_args['is_official_build'] = True    # Disable Skia test utilities.
-    gn_args['dart_component_kind'] = 'static_library' # Always link Dart in statically.
+    if args.target_os != 'wasm':
+      gn_args['dart_component_kind'] = 'static_library' # Always link Dart in statically.


Is the idea that this arg is unused by wasm an GN/Ninja complain?

Yes. If an arg is unused then gn will fail.

skia-gold · 2022-03-07T22:58:13Z

Gold has detected about 2 new digest(s) on patchset 9.
View them at https://flutter-engine-gold.skia.org/cl/github/31670

harryterkelsen · 2022-03-09T21:12:35Z

/cc @eyebrowsoffire

yjbanov

yjbanov · 2022-03-14T23:47:04Z

lib/web_ui/dev/steps/compile_tests_step.dart

@@ -110,7 +110,8 @@ Future<void> copySkiaTestImages() async {
    'images',
  ));

-  for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType<io.File>()) {
+  for (final io.File imageFile
+      in testImagesDir.listSync(recursive: true).whereType<io.File>()) {


nit: please undo formatting-only changes. Flutter style guide does not use dartfmt.

yjbanov · 2022-03-14T23:49:22Z

lib/web_ui/dev/steps/compile_tests_step.dart

-    .listSync(recursive: true, followLinks: true)
-    .whereType<io.File>();
+  Iterable<io.File> canvasKitFiles;
+  if (builtLocalCanvasKit) {


This if/else can be combined with the if/else below. Unless I'm missing something, there no shared logic applied to canvasKitFiles. I think it can also reduce the amount of file path massaging done for the profile build.

yjbanov · 2022-03-14T23:49:31Z

lib/web_ui/dev/steps/compile_tests_step.dart

@@ -184,7 +220,8 @@ Future<void> compileTests(List<FilePath> testFiles) async {
 }

 // Maximum number of concurrent dart2js processes to use.
-const int _dart2jsConcurrency = int.fromEnvironment('FELT_DART2JS_CONCURRENCY', defaultValue: 8);
+const int _dart2jsConcurrency =
+    int.fromEnvironment('FELT_DART2JS_CONCURRENCY', defaultValue: 8);


ditto: undo

lib/web_ui/dev/steps/compile_tests_step.dart

skia-gold · 2022-03-16T19:12:21Z

Gold has detected about 18 new digest(s) on patchset 26.
View them at https://flutter-engine-gold.skia.org/cl/github/31670

flutter-dashboard · 2022-03-16T19:35:28Z

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

Changes reported for pull request #31670 at sha 5ef3e78

* 09d7bcc Optionally specify the target dir in tools/gn (flutter/engine#32065) * a00ba24 Fix done button click not blur in iOS keyboard (flutter/engine#31718) * 81547d1 Add a display list op to clear to transformation stack. (flutter/engine#32050) * 2309bcc Add WASM target in gn (flutter/engine#31670) * 852e800 [web] Remove the --passfail flag when calling goldctl in post-submit (flutter/engine#32071) * eb1c50d Fix issues with nested gradients in html renderer. (flutter/engine#31887) * fb0fd74 Update the magic number for JPEG to just FF D8 FF. (flutter/engine#32076) * 233c17c Wrap the global timeline event handler callback in a std::atomic (flutter/engine#32073) * dfde2aa Roll Dart SDK from 24bf86f16411 to 5bc905e69609 (9 revisions) (flutter/engine#32075)

Add WASM target in gn.

ec98ce9

Rolls to latest version of ICU which supports building with WASM. Adds emsdk to DEPS to get the emscripten toolchain working.

harryterkelsen added the Work in progress (WIP) Not ready (yet) for review! label Feb 24, 2022

yjbanov reviewed Feb 28, 2022

View reviewed changes

tools/activate_emsdk.py Show resolved Hide resolved

tools/gn Show resolved Hide resolved

harryterkelsen added 4 commits March 2, 2022 16:39

Update felt to build CanvasKit locally

f9e231b

Merge branch 'main' into build-canvaskit-ninja

6364959

Move CanvasKit building logic to //flutter/BUILD.gn

97f626e

Format

08040f5

dnfield reviewed Mar 4, 2022

View reviewed changes

harryterkelsen added 4 commits March 4, 2022 16:37

Make new BUILD.gn file for CanvasKit in Flutter

8aa41b6

Format

afac75a

Roll buildroot

73409fb

Merge branch 'main' into build-canvaskit-ninja

0c949f0

harryterkelsen added 4 commits March 7, 2022 16:57

Add documentation, checkout to //buildtools

87d9db5

Fix gn for non-WASM builds. Update buildroot DEP

61e077a

Touch up DEPS

45cb40e

Fix DEPS condition

b4e89fb

harryterkelsen added 10 commits March 9, 2022 16:54

Fix licenses check

fd288db

Fix formatting

8c22f1b

update licenses

f3ae30f

Merge branch 'main' into build-canvaskit-ninja

fd78150

Update licenses

77bceed

Update licenses

a10d261

Merge branch 'main' into build-canvaskit-ninja

1c5453d

Update licenses

6f265f5

Merge branch 'main' into build-canvaskit-ninja

a652fd9

Update licenses

d0fa2f4

yjbanov approved these changes Mar 14, 2022

View reviewed changes

harryterkelsen removed the Work in progress (WIP) Not ready (yet) for review! label Mar 15, 2022

harryterkelsen added 3 commits March 15, 2022 16:33

Clean up logic and undo formatting

6528034

Undo formatting

c19295c

Merge branch 'main' into build-canvaskit-ninja

5ef3e78

flutter-dashboard bot added the will affect goldens label Mar 16, 2022

harryterkelsen merged commit 2309bcc into flutter:main Mar 16, 2022

engine-flutter-autoroll mentioned this pull request Mar 17, 2022

Roll Engine from 46c2ccae24e4 to dfde2aad73f9 (9 revisions) flutter/flutter#100270

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 17, 2022

2309bcc Add WASM target in gn (flutter/engine#31670)

442b0a5

Add WASM target in gn #31670

Add WASM target in gn #31670

Uh oh!

Conversation

harryterkelsen commented Feb 24, 2022

Pre-launch Checklist

Uh oh!

Uh oh!

Uh oh!

dnfield left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dnfield Mar 4, 2022

Choose a reason for hiding this comment

Uh oh!

harryterkelsen Mar 8, 2022

Choose a reason for hiding this comment

Uh oh!

dnfield Mar 4, 2022

Choose a reason for hiding this comment

Uh oh!

harryterkelsen Mar 8, 2022

Choose a reason for hiding this comment

Uh oh!

skia-gold commented Mar 7, 2022

Uh oh!

harryterkelsen commented Mar 9, 2022

Uh oh!

yjbanov left a comment

Choose a reason for hiding this comment

Uh oh!

yjbanov Mar 14, 2022

Choose a reason for hiding this comment

Uh oh!

yjbanov Mar 14, 2022

Choose a reason for hiding this comment

Uh oh!

yjbanov Mar 14, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

skia-gold commented Mar 16, 2022

Uh oh!

flutter-dashboard bot commented Mar 16, 2022

Uh oh!

Uh oh!