From 91fcb1b3e72d509a241c7a45493d092434c1799d Mon Sep 17 00:00:00 2001 From: Casey Hillers Date: Wed, 28 Feb 2024 12:30:42 -0800 Subject: [PATCH 1/2] Prefix flutter in flutter_vma.h import Breaks the Google build (b/327309677) --- impeller/renderer/backend/vulkan/device_buffer_vk.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impeller/renderer/backend/vulkan/device_buffer_vk.cc b/impeller/renderer/backend/vulkan/device_buffer_vk.cc index b31b28af20d0f..f642808204ea7 100644 --- a/impeller/renderer/backend/vulkan/device_buffer_vk.cc +++ b/impeller/renderer/backend/vulkan/device_buffer_vk.cc @@ -5,7 +5,7 @@ #include "impeller/renderer/backend/vulkan/device_buffer_vk.h" #include "flutter/fml/trace_event.h" -#include "flutter_vma/flutter_vma.h" +#include "flutter/flutter_vma/flutter_vma.h" #include "impeller/renderer/backend/vulkan/context_vk.h" #include "vulkan/vulkan_core.h" From bddd6fb6d70e784485b7c1999bdf28bdd78c4890 Mon Sep 17 00:00:00 2001 From: Casey Hillers Date: Wed, 28 Feb 2024 13:36:37 -0800 Subject: [PATCH 2/2] Fix import ordering --- impeller/renderer/backend/vulkan/device_buffer_vk.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impeller/renderer/backend/vulkan/device_buffer_vk.cc b/impeller/renderer/backend/vulkan/device_buffer_vk.cc index f642808204ea7..a43a5825fd562 100644 --- a/impeller/renderer/backend/vulkan/device_buffer_vk.cc +++ b/impeller/renderer/backend/vulkan/device_buffer_vk.cc @@ -4,8 +4,8 @@ #include "impeller/renderer/backend/vulkan/device_buffer_vk.h" -#include "flutter/fml/trace_event.h" #include "flutter/flutter_vma/flutter_vma.h" +#include "flutter/fml/trace_event.h" #include "impeller/renderer/backend/vulkan/context_vk.h" #include "vulkan/vulkan_core.h"