From a52f7da00ed0644ea0524059ac10e32caf42613f Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Sun, 5 Feb 2023 10:18:59 -0800 Subject: [PATCH 1/2] Fix cpp-wrappers archive. --- shell/platform/windows/client_wrapper/BUILD.gn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/platform/windows/client_wrapper/BUILD.gn b/shell/platform/windows/client_wrapper/BUILD.gn index 99b9f0c8b2dd8..28076712b3863 100644 --- a/shell/platform/windows/client_wrapper/BUILD.gn +++ b/shell/platform/windows/client_wrapper/BUILD.gn @@ -120,21 +120,21 @@ zip_bundle("client_wrapper_archive") { "//flutter/shell/platform/common/client_wrapper:client_wrapper", ] tmp_files = [] - foreach(source, client_wrapper_file_archive_list) { + foreach(source_file, client_wrapper_file_archive_list) { tmp_files += [ { - source = "//flutter/shell/platform/common/client_wrapper/$source" - destination = "cpp_client_wrapper/$source" + source = "//flutter/shell/platform/common/client_wrapper/$source_file" + destination = "cpp_client_wrapper/$source_file" }, ] } # Windows specific source code files - foreach(source, win_client_wrapper_file_archive_list) { + foreach(source_file, win_client_wrapper_file_archive_list) { tmp_files += [ { - source = "//flutter/shell/platform/windows/client_wrapper/$source" - destination = "cpp_client_wrapper/$source" + source = "//flutter/shell/platform/windows/client_wrapper/$source_file" + destination = "cpp_client_wrapper/$source_file" }, ] } From 73f5febab55846e57494d2ad6ecb5b6c20818ab7 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Sun, 5 Feb 2023 16:57:22 -0800 Subject: [PATCH 2/2] Include wrapper headers. --- shell/platform/windows/client_wrapper/BUILD.gn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/shell/platform/windows/client_wrapper/BUILD.gn b/shell/platform/windows/client_wrapper/BUILD.gn index 28076712b3863..88d25d75c97be 100644 --- a/shell/platform/windows/client_wrapper/BUILD.gn +++ b/shell/platform/windows/client_wrapper/BUILD.gn @@ -138,6 +138,8 @@ zip_bundle("client_wrapper_archive") { }, ] } + + # Headers headers = core_cpp_client_wrapper_includes + core_cpp_client_wrapper_internal_headers foreach(header, headers) { @@ -150,5 +152,18 @@ zip_bundle("client_wrapper_archive") { }, ] } + + # Wrapper includes + foreach(header, _wrapper_includes) { + rebased_path = + rebase_path("//flutter/shell/platform/windows/client_wrapper/$header", + "//flutter/shell/platform/windows/client_wrapper") + tmp_files += [ + { + source = header + destination = "cpp_client_wrapper/$rebased_path" + }, + ] + } files = tmp_files }