Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] specify all defines used for html, ck, auto rendering modes #23433

Merged
merged 2 commits into from
Jan 6, 2021
Merged

[web] specify all defines used for html, ck, auto rendering modes #23433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29053bb
[web] specify all defines used for html, ck, auto rendering modes
jonahwilliams Jan 5, 2021
477c4bb
Merge branch 'master' of github.com:flutter/engine into fix_web_defines
Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions web_sdk/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ copy("web_ui_library") {
outputs = [ "$root_out_dir/flutter_web_sdk/{{source_file_part}}" ]
}

# Compile the DDC SDK's summary.
# Compile the unsound DDC SDK's summary.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -141,7 +141,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
]
}

# Compiles the DDC SDK's JS code.
# Compiles the unsound html only renderer.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -181,6 +181,8 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=false",
"-DFLUTTER_WEB_AUTO_DETECT=false",
"--modules",
"amd",
"-o",
Expand All @@ -192,7 +194,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
]
}

# Compiles the DDC CanvasKit SDK's JS code.
# Compiles the unsound canvaskit only renderer.
prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -233,6 +235,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") {
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=true",
"-DFLUTTER_WEB_AUTO_DETECT=false",
"--modules",
"amd",
"-o",
Expand All @@ -246,7 +249,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") {
]
}

# Compiles the DDC CanvasKit and Html SDK's JS code.
# Compiles the unsound autodetect renderer.
prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -286,6 +289,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk") {
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=true",
Copy link
Contributor Author

@jonahwilliams jonahwilliams Jan 5, 2021

Choose a reason for hiding this comment

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

Does autodetect use skia=true?

Copy link
Contributor

@angjieli angjieli Jan 5, 2021

Choose a reason for hiding this comment

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

You can remove this. It doesn't matter once FLUTTER_WEB_AUTO_DETECT is specified.

Copy link
Contributor

@ferhatb ferhatb Jan 5, 2021

Choose a reason for hiding this comment

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

autodetect has higher precedence, it doesn't check skia at that point.

Copy link
Contributor Author

@jonahwilliams jonahwilliams Jan 5, 2021

Choose a reason for hiding this comment

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

OK, I'll leave it as set just so it is easier to change in the future.

"-DFLUTTER_WEB_AUTO_DETECT=true",
"--modules",
"amd",
Expand All @@ -300,7 +304,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk") {
]
}

# Compiles the DDC SDK's JS code for null safety.
# Compiles the sound html only renderer.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk_sound") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -341,6 +345,8 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_sound") {
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=false",
"-DFLUTTER_WEB_AUTO_DETECT=false",
"--modules",
"amd",
"-o",
Expand All @@ -353,7 +359,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_sound") {
]
}

# Compiles the DDC CanvasKit SDK's JS code for null safety.
# Compiles the sound canvaskit only renderer.
prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk_sound") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -395,6 +401,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk_sound") {
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=true",
"-DFLUTTER_WEB_AUTO_DETECT=false",
"--modules",
"amd",
"-o",
Expand All @@ -408,7 +415,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk_sound") {
]
}

# Compiles the DDC CanvasKit and Html SDK's JS code for null safety.
# Compiles the sound autodetect renderer.
prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk_sound") {
deps = [
"//third_party/dart:create_sdk",
Expand Down Expand Up @@ -449,6 +456,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk_sound") {
"--libraries-file",
"org-dartlang-sdk:///flutter_web_sdk/libraries.json",
"--inline-source-map",
"-DFLUTTER_WEB_USE_SKIA=false",
"-DFLUTTER_WEB_AUTO_DETECT=true",
"--modules",
"amd",
Expand All @@ -463,7 +471,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk_sound") {
]
}

# Compile the DDC SDK's summary.
# Compile the sound DDC SDK's summary.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline_sound") {
deps = [
"//third_party/dart:create_sdk",
Expand Down