Fix gn problem impacting fuchsia builds. (flutter/engine#31615)

This commit is contained in:
godofredoc 2022-02-22 13:59:09 -08:00 committed by GitHub
parent 61cf7178fe
commit 7525d73232
2 changed files with 58 additions and 53 deletions

View File

@ -84,6 +84,8 @@ if (build_engine_artifacts && flutter_prebuilt_dart_sdk) {
}
# Archives Flutter Web SDK
group("flutter_web_sdk") {
deps = [ "//flutter/web_sdk:flutter_web_sdk_archive" ]
if (!is_fuchsia) {
group("flutter_web_sdk") {
deps = [ "//flutter/web_sdk:flutter_web_sdk_archive" ]
}
}

View File

@ -566,57 +566,60 @@ _kernel_worker("flutter_dartdevc_kernel_sdk_outline_sound") {
}
# Archives Flutter Web SDK
zip_bundle("flutter_web_sdk_archive") {
output = "flutter-web-sdk-${host_os_cpu_name}.zip"
deps = [
":flutter_dartdevc_canvaskit_html_kernel_sdk",
":flutter_dartdevc_canvaskit_html_kernel_sdk_sound",
":flutter_dartdevc_canvaskit_kernel_sdk",
":flutter_dartdevc_canvaskit_kernel_sdk_sound",
":flutter_dartdevc_kernel_sdk",
":flutter_dartdevc_kernel_sdk_outline",
":flutter_dartdevc_kernel_sdk_outline_sound",
":flutter_dartdevc_kernel_sdk_sound",
":web_engine_sources",
":web_ui_library",
":web_ui_sources",
]
sources = get_target_outputs(":flutter_dartdevc_canvaskit_html_kernel_sdk")
sources +=
get_target_outputs(":flutter_dartdevc_canvaskit_html_kernel_sdk_sound")
sources += get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk")
sources += get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_sound")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_sound")
sources += get_target_outputs(":web_ui_library")
tmp_files = []
foreach(source, sources) {
tmp_files += [
{
source = source
destination = rebase_path(source, "$root_build_dir")
},
if (!is_fuchsia) {
zip_bundle("flutter_web_sdk_archive") {
output = "flutter-web-sdk-${host_os_cpu_name}.zip"
deps = [
":flutter_dartdevc_canvaskit_html_kernel_sdk",
":flutter_dartdevc_canvaskit_html_kernel_sdk_sound",
":flutter_dartdevc_canvaskit_kernel_sdk",
":flutter_dartdevc_canvaskit_kernel_sdk_sound",
":flutter_dartdevc_kernel_sdk",
":flutter_dartdevc_kernel_sdk_outline",
":flutter_dartdevc_kernel_sdk_outline_sound",
":flutter_dartdevc_kernel_sdk_sound",
":web_engine_sources",
":web_ui_library",
":web_ui_sources",
]
sources = get_target_outputs(":flutter_dartdevc_canvaskit_html_kernel_sdk")
sources +=
get_target_outputs(":flutter_dartdevc_canvaskit_html_kernel_sdk_sound")
sources += get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk")
sources +=
get_target_outputs(":flutter_dartdevc_canvaskit_kernel_sdk_sound")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_outline_sound")
sources += get_target_outputs(":flutter_dartdevc_kernel_sdk_sound")
sources += get_target_outputs(":web_ui_library")
tmp_files = []
foreach(source, sources) {
tmp_files += [
{
source = source
destination = rebase_path(source, "$root_build_dir")
},
]
}
foreach(source, web_ui_sources) {
rebased_path = rebase_path(source, "//flutter/lib/web_ui/lib")
tmp_files += [
{
source = source
destination = "flutter_web_sdk/lib/ui/$rebased_path"
},
]
}
foreach(source, web_engine_sources) {
rebased_path = rebase_path(source, "//flutter/lib/web_ui/lib/src")
tmp_files += [
{
source = source
destination = "flutter_web_sdk/lib/_engine/$rebased_path"
},
]
}
files = tmp_files
}
foreach(source, web_ui_sources) {
rebased_path = rebase_path(source, "//flutter/lib/web_ui/lib")
tmp_files += [
{
source = source
destination = "flutter_web_sdk/lib/ui/$rebased_path"
},
]
}
foreach(source, web_engine_sources) {
rebased_path = rebase_path(source, "//flutter/lib/web_ui/lib/src")
tmp_files += [
{
source = source
destination = "flutter_web_sdk/lib/_engine/$rebased_path"
},
]
}
files = tmp_files
}