Migrate vulkan_memory_allocator to flutter/third_party

Migrates vulkan_memory_allocator from the buildroot's third_party directory to the engine's. Issue: flutter/flutter#144812 Part of: flutter/flutter#67373
cbracken · Mar 8, 2024 · cf6475d · cf6475d
1 parent 68f1d69
commit cf6475d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/DEPS b/DEPS
@@ -680,7 +680,7 @@ deps = {
    'src/flutter/third_party/angle':
    Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
 
-   'src/third_party/vulkan_memory_allocator':
+   'src/flutter/third_party/vulkan_memory_allocator':
    Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
 
    'src/flutter/third_party/abseil-cpp':

diff --git a/...rd_party/vulkan_memory_allocator/BUILD.gn → ...rd_party/vulkan_memory_allocator/BUILD.gn b/...rd_party/vulkan_memory_allocator/BUILD.gn → ...rd_party/vulkan_memory_allocator/BUILD.gn
diff --git a/build_overrides/angle.gni b/build_overrides/angle.gni
@@ -31,7 +31,8 @@ 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 = "//third_party/vulkan_memory_allocator"
+angle_vulkan_memory_allocator_dir =
+    "//flutter/third_party/vulkan_memory_allocator"
 
 # 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/BUILD.gn b/flutter_vma/BUILD.gn
@@ -17,7 +17,7 @@ source_set("flutter_vma") {
   public_deps = [
     "//flutter/fml",
     "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
+    "//flutter/third_party/vulkan_memory_allocator",
   ]
 
   public_configs = [ "//flutter:config" ]

diff --git a/impeller/renderer/backend/vulkan/BUILD.gn b/impeller/renderer/backend/vulkan/BUILD.gn
@@ -128,6 +128,6 @@ impeller_component("vulkan") {
     "//flutter/flutter_vma",
     "//flutter/fml",
     "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
-    "//third_party/vulkan_memory_allocator",
+    "//flutter/third_party/vulkan_memory_allocator",
   ]
 }
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
@@ -155,6 +155,11 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/vulkan-deps/vulkan-tools', // on hosts for tests
   r'flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md', // redundant with licenses inside files
   r'flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs',
+  r'flutter/third_party/vulkan_memory_allocator/bin',
+  r'flutter/third_party/vulkan_memory_allocator/docs',
+  r'flutter/third_party/vulkan_memory_allocator/media',
+  r'flutter/third_party/vulkan_memory_allocator/src',
+  r'flutter/third_party/vulkan_memory_allocator/tools',
   r'flutter/third_party/wuffs/docs',
   r'flutter/third_party/wuffs/script',
   r'flutter/third_party/yapf', // only used for code formatting
@@ -212,11 +217,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
   r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
   r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
-  r'third_party/vulkan_memory_allocator/bin',
-  r'third_party/vulkan_memory_allocator/docs',
-  r'third_party/vulkan_memory_allocator/media',
-  r'third_party/vulkan_memory_allocator/src',
-  r'third_party/vulkan_memory_allocator/tools',
   r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies
   r'third_party/zlib/contrib/minizip/miniunz.c', // sample file
   r'third_party/zlib/contrib/minizip/minizip.c', // sample file