From 91f0ef1e61fec8c5d037d52a7e182fd00cd3c5bb Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Fri, 1 Nov 2024 23:29:32 +0000 Subject: [PATCH 1/2] Made it so angle builds on linux --- build_overrides/angle.gni | 3 +-- flutter_vma/include/README.md | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 flutter_vma/include/README.md diff --git a/build_overrides/angle.gni b/build_overrides/angle.gni index 9fa8f46c0238a..2ee36b37e9593 100644 --- a/build_overrides/angle.gni +++ b/build_overrides/angle.gni @@ -31,8 +31,7 @@ angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src" angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src" angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src" -angle_vulkan_memory_allocator_dir = - "//flutter/third_party/vulkan_memory_allocator" +angle_vulkan_memory_allocator_dir = "//flutter/flutter_vma" # This is a general Chromium flag, but in the Flutter build only ANGLE needs it # so it is defined here. diff --git a/flutter_vma/include/README.md b/flutter_vma/include/README.md new file mode 100644 index 0000000000000..373e37ad14d6f --- /dev/null +++ b/flutter_vma/include/README.md @@ -0,0 +1 @@ +This folder is here to match Angle's expectations for the VMA directory. From 2d64112ca55e49481fa9c509475ec2f6d92174b3 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Fri, 1 Nov 2024 23:58:02 +0000 Subject: [PATCH 2/2] licenses --- ci/licenses_golden/excluded_files | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index df0d4e3655f15..08ea91fd7095f 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -84,6 +84,7 @@ ../../../flutter/flow/texture_unittests.cc ../../../flutter/flow/view_slicer_unittests.cc ../../../flutter/flutter_frontend_server +../../../flutter/flutter_vma/include/README.md ../../../flutter/fml/ascii_trie_unittests.cc ../../../flutter/fml/backtrace_unittests.cc ../../../flutter/fml/base32_unittest.cc