From ab12617c32c488223780dfe7c879ff2b8c698eec Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:28:01 -0800 Subject: [PATCH] Made it so angle builds on linux (flutter/engine#56328) fixes: https://github.com/flutter/flutter/issues/151353 Before this PR, angle would not build on linux, now it does. example: ``` ./flutter/bin/et build -c host_debug_unopt //flutter/third_party/angle:libGLESv2 ``` There isn't a CI step that builds this today to verify it keeps working, I implemented this as part of the work to see if i could get the golden test runner working on linux. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style --- engine/src/flutter/build_overrides/angle.gni | 3 +-- engine/src/flutter/ci/licenses_golden/excluded_files | 1 + engine/src/flutter/flutter_vma/include/README.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 engine/src/flutter/flutter_vma/include/README.md diff --git a/engine/src/flutter/build_overrides/angle.gni b/engine/src/flutter/build_overrides/angle.gni index 9fa8f46c023..2ee36b37e95 100644 --- a/engine/src/flutter/build_overrides/angle.gni +++ b/engine/src/flutter/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/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 93eccecdfab..d877acc97d3 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/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 diff --git a/engine/src/flutter/flutter_vma/include/README.md b/engine/src/flutter/flutter_vma/include/README.md new file mode 100644 index 00000000000..373e37ad14d --- /dev/null +++ b/engine/src/flutter/flutter_vma/include/README.md @@ -0,0 +1 @@ +This folder is here to match Angle's expectations for the VMA directory.